Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(TS): color merge conflict #8133

Merged
merged 18 commits into from Aug 7, 2022
Merged

fix(TS): color merge conflict #8133

merged 18 commits into from Aug 7, 2022

Conversation

ShaMan123
Copy link
Contributor

@ShaMan123 ShaMan123 commented Aug 7, 2022 •
edited

fix c6b6a5f that is wrong
and do some more es6/ts

@github-actions
Copy link
Contributor

github-actions bot commented Aug 7, 2022 •
edited

Code Coverage Summary

> fabric@5.1.0 coverage:report
> nyc report --reporter=lcov --reporter=text

-----------|---------|----------|---------|---------|-----------------------------------------------
File       | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                             
-----------|---------|----------|---------|---------|-----------------------------------------------
All files  |   82.09 |     74.5 |   84.48 |   80.66 |                                               
 fabric.js |   82.09 |     74.5 |   84.48 |   80.66 | ...,27483,27493-27537,27645,27732,27936,28077 
-----------|---------|----------|---------|---------|-----------------------------------------------

@github-actions
Copy link
Contributor

github-actions bot commented Aug 7, 2022 •
edited

Code Coverage Summary

> fabric@5.1.0 coverage:report
> nyc report --reporter=lcov --reporter=text

-----------|---------|----------|---------|---------|-----------------------------------------------
File       | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                             
-----------|---------|----------|---------|---------|-----------------------------------------------
All files  |   82.07 |    74.48 |   84.51 |   80.64 |                                               
 fabric.js |   82.07 |    74.48 |   84.51 |   80.64 | ...,27478,27488-27532,27640,27727,27931,28072 
-----------|---------|----------|---------|---------|-----------------------------------------------

@github-actions
Copy link
Contributor

github-actions bot commented Aug 7, 2022 •
edited

Code Coverage Summary

> fabric@5.1.0 coverage:report
> nyc report --reporter=lcov --reporter=text

-----------|---------|----------|---------|---------|-----------------------------------------------
File       | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                             
-----------|---------|----------|---------|---------|-----------------------------------------------
All files  |   82.07 |    74.48 |   84.51 |   80.64 |                                               
 fabric.js |   82.07 |    74.48 |   84.51 |   80.64 | ...,27478,27488-27532,27640,27727,27931,28072 
-----------|---------|----------|---------|---------|-----------------------------------------------

1 similar comment
@github-actions
Copy link
Contributor

github-actions bot commented Aug 7, 2022 •
edited

Code Coverage Summary

> fabric@5.1.0 coverage:report
> nyc report --reporter=lcov --reporter=text

-----------|---------|----------|---------|---------|-----------------------------------------------
File       | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                             
-----------|---------|----------|---------|---------|-----------------------------------------------
All files  |   82.07 |    74.48 |   84.51 |   80.64 |                                               
 fabric.js |   82.07 |    74.48 |   84.51 |   80.64 | ...,27478,27488-27532,27640,27727,27931,28072 
-----------|---------|----------|---------|---------|-----------------------------------------------

@github-actions
Copy link
Contributor

github-actions bot commented Aug 7, 2022 •
edited

Code Coverage Summary

> fabric@5.1.0 coverage:report
> nyc report --reporter=lcov --reporter=text

-----------|---------|----------|---------|---------|-----------------------------------------------
File       | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                             
-----------|---------|----------|---------|---------|-----------------------------------------------
All files  |   82.07 |    74.48 |   84.51 |   80.64 |                                               
 fabric.js |   82.07 |    74.48 |   84.51 |   80.64 | ...,27478,27488-27532,27640,27727,27931,28072 
-----------|---------|----------|---------|---------|-----------------------------------------------

@github-actions
Copy link
Contributor

github-actions bot commented Aug 7, 2022 •
edited

Code Coverage Summary

> fabric@5.1.0 coverage:report
> nyc report --reporter=lcov --reporter=text

-----------|---------|----------|---------|---------|-----------------------------------------------
File       | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                             
-----------|---------|----------|---------|---------|-----------------------------------------------
All files  |   82.07 |    74.48 |   84.51 |   80.64 |                                               
 fabric.js |   82.07 |    74.48 |   84.51 |   80.64 | ...,27477,27487-27531,27639,27726,27930,28071 
-----------|---------|----------|---------|---------|-----------------------------------------------

ShaMan123
ShaMan123 commented Aug 7, 2022
View reviewed changes
Copy link
Contributor Author

@ShaMan123 ShaMan123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a bit a types
Fixed the attribution link
Cleanup a bit

src/color/color.class.ts

var h, s, l,
max = arrayMax([r, g, b]),
min = arrayMin([r, g, b]);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these 2 line are what caused the conflict
I accidently did a different rename in #8116

@github-actions
Copy link
Contributor

github-actions bot commented Aug 7, 2022 •
edited

Code Coverage Summary

> fabric@5.1.0 coverage:report
> nyc report --reporter=lcov --reporter=text

-----------|---------|----------|---------|---------|-----------------------------------------------
File       | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                             
-----------|---------|----------|---------|---------|-----------------------------------------------
All files  |   82.12 |    74.51 |   84.51 |    80.7 |                                               
 fabric.js |   82.12 |    74.51 |   84.51 |    80.7 | ...,27477,27487-27531,27639,27726,27930,28071 
-----------|---------|----------|---------|---------|-----------------------------------------------

@asturur asturur merged commit bb03d13 into master Aug 7, 2022
@asturur asturur deleted the ts-color branch September 11, 2022 23:03
frankrousseau pushed a commit to cgwire/fabric.js that referenced this pull request Jan 6, 2023
@ShaMan123 @asturur @frankrousseau
fix(TS): color merge conflict (fabricjs#8133)
3a4acd8 
Co-authored-by: Andrea Bogazzi <andreabogazzi79@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asturur asturur asturur approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ShaMan123 @asturur