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

Color.class update #3615

Merged
merged 19 commits into from
Jan 9, 2017
Merged

Color.class update #3615

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c3e301b
Merge pull request #1 from kangax/master
Aug 20, 2016
b9d2cc4
Merge pull request #2 from kangax/master
Aug 20, 2016
6a87502
Merge pull request #3 from kangax/master
Aug 22, 2016
5317b29
Merge pull request #4 from kangax/master
Aug 23, 2016
b4dbc66
Merge pull request #5 from kangax/master
Aug 27, 2016
d52ba0e
Merge pull request #6 from kangax/master
Aug 29, 2016
1ce92c5
Merge pull request #7 from kangax/master
Sep 7, 2016
65e40be
Merge pull request #9 from kangax/master
Sep 12, 2016
64e8741
Merge pull request #10 from kangax/master
Dec 26, 2016
4572d0d
Merge pull request #11 from kangax/master
Dec 31, 2016
69d2b7f
Merge pull request #12 from kangax/master
Jan 2, 2017
1643827
New Build
neopheus Jan 2, 2017
54722ac
Merge remote-tracking branch 'kangax/master'
neopheus Jan 8, 2017
fd314c0
test
neopheus Jan 9, 2017
61ad954
Merge remote-tracking branch 'origin'
neopheus Jan 9, 2017
fa05a14
1.7.3
neopheus Jan 9, 2017
abd5413
Merge pull request #13 from kangax/master
Jan 9, 2017
f66da26
JSDoc update
neopheus Jan 9, 2017
307b3f0
Update toHexa Function (asturur)
neopheus Jan 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions src/color.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
},

/**
* Returns color represenation in RGB format
* Returns color representation in RGB format
* @return {String} ex: rgb(0-255,0-255,0-255)
*/
toRgb: function() {
Expand All @@ -135,7 +135,7 @@
},

/**
* Returns color represenation in RGBA format
* Returns color representation in RGBA format
* @return {String} ex: rgba(0-255,0-255,0-255,0-1)
*/
toRgba: function() {
Expand All @@ -144,7 +144,7 @@
},

/**
* Returns color represenation in HSL format
* Returns color representation in HSL format
* @return {String} ex: hsl(0-360,0%-100%,0%-100%)
*/
toHsl: function() {
Expand All @@ -155,7 +155,7 @@
},

/**
* Returns color represenation in HSLA format
* Returns color representation in HSLA format
* @return {String} ex: hsla(0-360,0%-100%,0%-100%,0-1)
*/
toHsla: function() {
Expand All @@ -166,7 +166,7 @@
},

/**
* Returns color represenation in HEX format
* Returns color representation in HEX format
* @return {String} ex: FF5555
*/
toHex: function() {
Expand All @@ -184,6 +184,29 @@
return r.toUpperCase() + g.toUpperCase() + b.toUpperCase();
},

/**
* Returns color representation in HEXA format
* @return {String} ex: FF5555CC
*/
toHexa: function() {
var source = this.getSource(), r, g, b, a;

r = source[0].toString(16);
r = (r.length === 1) ? ('0' + r) : r;

g = source[1].toString(16);
g = (g.length === 1) ? ('0' + g) : g;

b = source[2].toString(16);
b = (b.length === 1) ? ('0' + b) : b;

a = source[3] * 255;
a = a.toString(16);
a = (a.length === 1) ? ('0' + a) : a;

return r.toUpperCase() + g.toUpperCase() + b.toUpperCase() + a.toUpperCase();
Copy link
Member

Choose a reason for hiding this comment

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

all this could be return this.toHex() + a.toUpperCase() so we do not need to duplicate toHex code again.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's do :)

},

/**
* Gets value of alpha channel for this color
* @return {Number} 0-1
Expand Down
10 changes: 10 additions & 0 deletions test/unit/color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,22 @@
equal(oColor.toHex(), '000000');
});

test('toHexa', function() {
var oColor = new fabric.Color('ffffffff');
ok(typeof oColor.toHexa == 'function');
equal(oColor.toHexa(), 'FFFFFFFF');
oColor.setSource([255,255,255,0.8]);
equal(oColor.toHexa(), 'FFFFFFCC');
});

test('getAlpha', function() {
var oColor = new fabric.Color('ffffff');
ok(typeof oColor.getAlpha == 'function');
equal(oColor.getAlpha(), 1);
oColor.setSource([10,20,30, 0.456]);
equal(oColor.getAlpha(), 0.456);
oColor = new fabric.Color('ffffffcc');
equal(oColor.getAlpha(), 0.8);
});

test('setAlpha', function() {
Expand Down