Skip to content

remove spaces from color hex codes #18

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

remove spaces from color hex codes #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e269e3d
remove spaces from color hex codes
AJFunk Feb 3, 2017
c1dd2a1
accept RGBA when converting RGB to HEX
AJFunk Feb 14, 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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules
node_modules
.DS_Store
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# minify

minify:
uglifyjs -nc jquery.expect.js > jquery.expect.min.js
uglifyjs -nc -o jquery.expect.min.js -- jquery.expect.js

lint:
jshint jquery.expect.js
Expand Down
208 changes: 104 additions & 104 deletions jquery.expect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
, 'bisque': '#FFE4C4'
, 'black': '#000000'
, 'blanchedalmond': '#FFEBCD'
, 'blue': '#0000FF '
, 'blue': '#0000FF'
, 'blueviolet': '#8A2BE2'
, 'brown': '#A52A2A'
, 'burlywood': '#DEB887'
Expand All @@ -92,121 +92,121 @@
, 'chocolate': '#D2691E'
, 'coral': '#FF7F50'
, 'cornflowerblue': '#6495ED'
, 'cornsilk': '#FFF8DC '
, 'crimson': '#DC143C '
, 'cyan': '#00FFFF '
, 'cornsilk': '#FFF8DC'
, 'crimson': '#DC143C'
, 'cyan': '#00FFFF'
, 'darkblue': '#00008B'
, 'darkcyan': '#008B8B'
, 'darkgoldenrod': '#B8860B'
, 'darkgray': '#A9A9A9 '
, 'darkgreen': '#006400 '
, 'darkgrey': '#A9A9A9 '
, 'darkkhaki': '#BDB76B '
, 'darkmagenta': '#8B008B '
, 'darkolivegreen': '#556B2F '
, 'darkorange': '#FF8C00 '
, 'darkorchid': '#9932CC '
, 'darkgray': '#A9A9A9'
, 'darkgreen': '#006400'
, 'darkgrey': '#A9A9A9'
, 'darkkhaki': '#BDB76B'
, 'darkmagenta': '#8B008B'
, 'darkolivegreen': '#556B2F'
, 'darkorange': '#FF8C00'
, 'darkorchid': '#9932CC'
, 'darkred': '#8B0000'
, 'darksalmon': '#E9967A '
, 'darkseagreen': '#8FBC8F '
, 'darkslateblue': '#483D8B '
, 'darkslategray': '#2F4F4F '
, 'darkslategrey': '#2F4F4F '
, 'darkturquoise': '#00CED1 '
, 'darkviolet': '#9400D3 '
, 'deeppink': '#FF1493 '
, 'darksalmon': '#E9967A'
, 'darkseagreen': '#8FBC8F'
, 'darkslateblue': '#483D8B'
, 'darkslategray': '#2F4F4F'
, 'darkslategrey': '#2F4F4F'
, 'darkturquoise': '#00CED1'
, 'darkviolet': '#9400D3'
, 'deeppink': '#FF1493'
, 'deepskyblue': '#00BFFF'
, 'dimgray': '#696969 '
, 'dimgrey': '#696969 '
, 'dimgray': '#696969'
, 'dimgrey': '#696969'
, 'dodgerblue': '#1E90FF'
, 'firebrick': '#B22222 '
, 'firebrick': '#B22222'
, 'floralwhite': '#FFFAF0'
, 'forestgreen': '#228B22'
, 'fuchsia': '#FF00FF '
, 'gainsboro': '#DCDCDC '
, 'ghostwhite': '#F8F8FF '
, 'gold': '#FFD700 '
, 'goldenrod': '#DAA520 '
, 'gray': '#808080 '
, 'green': '#008000 '
, 'greenyellow': '#ADFF2F '
, 'grey': '#808080 '
, 'honeydew': '#F0FFF0 '
, 'hotpink': '#FF69B4 '
, 'fuchsia': '#FF00FF'
, 'gainsboro': '#DCDCDC'
, 'ghostwhite': '#F8F8FF'
, 'gold': '#FFD700'
, 'goldenrod': '#DAA520'
, 'gray': '#808080'
, 'green': '#008000'
, 'greenyellow': '#ADFF2F'
, 'grey': '#808080'
, 'honeydew': '#F0FFF0'
, 'hotpink': '#FF69B4'
, 'indianred': '#CD5C5C'
, 'indigo': '#4B0082 '
, 'ivory': '#FFFFF0 '
, 'khaki': '#F0E68C '
, 'indigo': '#4B0082'
, 'ivory': '#FFFFF0'
, 'khaki': '#F0E68C'
, 'lavender': '#E6E6FA'
, 'lavenderblush': '#FFF0F5 '
, 'lawngreen': '#7CFC00 '
, 'lemonchiffon': '#FFFACD '
, 'lightblue': '#ADD8E6 '
, 'lightcoral': '#F08080 '
, 'lightcyan': '#E0FFFF '
, 'lightgoldenrodyellow': '#FAFAD2 '
, 'lightgray': '#D3D3D3 '
, 'lightgreen': '#90EE90 '
, 'lightgrey': '#D3D3D3 '
, 'lightpink': '#FFB6C1 '
, 'lightsalmon': '#FFA07A '
, 'lavenderblush': '#FFF0F5'
, 'lawngreen': '#7CFC00'
, 'lemonchiffon': '#FFFACD'
, 'lightblue': '#ADD8E6'
, 'lightcoral': '#F08080'
, 'lightcyan': '#E0FFFF'
, 'lightgoldenrodyellow': '#FAFAD2'
, 'lightgray': '#D3D3D3'
, 'lightgreen': '#90EE90'
, 'lightgrey': '#D3D3D3'
, 'lightpink': '#FFB6C1'
, 'lightsalmon': '#FFA07A'
, 'lightseagreen': '#20B2AA'
, 'lightskyblue': '#87CEFA '
, 'lightslategray': '#778899 '
, 'lightslategrey': '#778899 '
, 'lightsteelblue': '#B0C4DE '
, 'lightyellow': '#FFFFE0 '
, 'lime': '#00FF00 '
, 'limegreen': '#32CD32 '
, 'linen': '#FAF0E6 '
, 'magenta': '#FF00FF '
, 'maroon': '#800000 '
, 'mediumaquamarine': '#66CDAA '
, 'mediumblue': '#0000CD '
, 'mediumorchid': '#BA55D3 '
, 'mediumpurple': '#9370DB '
, 'mediumseagreen': '#3CB371 '
, 'mediumslateblue': '#7B68EE '
, 'lightskyblue': '#87CEFA'
, 'lightslategray': '#778899'
, 'lightslategrey': '#778899'
, 'lightsteelblue': '#B0C4DE'
, 'lightyellow': '#FFFFE0'
, 'lime': '#00FF00'
, 'limegreen': '#32CD32'
, 'linen': '#FAF0E6'
, 'magenta': '#FF00FF'
, 'maroon': '#800000'
, 'mediumaquamarine': '#66CDAA'
, 'mediumblue': '#0000CD'
, 'mediumorchid': '#BA55D3'
, 'mediumpurple': '#9370DB'
, 'mediumseagreen': '#3CB371'
, 'mediumslateblue': '#7B68EE'
, 'mediumspringgreen': '#00FA9A'
, 'mediumturquoise': '#48D1CC '
, 'mediumvioletred': '#C71585 '
, 'midnightblue': '#191970 '
, 'mintcream': '#F5FFFA '
, 'mistyrose': '#FFE4E1 '
, 'moccasin': '#FFE4B5 '
, 'mediumturquoise': '#48D1CC'
, 'mediumvioletred': '#C71585'
, 'midnightblue': '#191970'
, 'mintcream': '#F5FFFA'
, 'mistyrose': '#FFE4E1'
, 'moccasin': '#FFE4B5'
, 'navajowhite': '#FFDEAD'
, 'navy': '#000080 '
, 'oldlace': '#FDF5E6 '
, 'olive': '#808000 '
, 'olivedrab': '#6B8E23 '
, 'orange': '#FFA500 '
, 'orangered': '#FF4500 '
, 'orchid': '#DA70D6 '
, 'palegoldenrod': '#EEE8AA '
, 'palegreen': '#98FB98 '
, 'paleturquoise': '#AFEEEE '
, 'palevioletred': '#DB7093 '
, 'papayawhip': '#FFEFD5 '
, 'peachpuff': '#FFDAB9 '
, 'peru': '#CD853F '
, 'pink': '#FFC0CB '
, 'plum': '#DDA0DD '
, 'powderblue': '#B0E0E6 '
, 'purple': '#800080 '
, 'navy': '#000080'
, 'oldlace': '#FDF5E6'
, 'olive': '#808000'
, 'olivedrab': '#6B8E23'
, 'orange': '#FFA500'
, 'orangered': '#FF4500'
, 'orchid': '#DA70D6'
, 'palegoldenrod': '#EEE8AA'
, 'palegreen': '#98FB98'
, 'paleturquoise': '#AFEEEE'
, 'palevioletred': '#DB7093'
, 'papayawhip': '#FFEFD5'
, 'peachpuff': '#FFDAB9'
, 'peru': '#CD853F'
, 'pink': '#FFC0CB'
, 'plum': '#DDA0DD'
, 'powderblue': '#B0E0E6'
, 'purple': '#800080'
, 'red': '#FF0000'
, 'rosybrown': '#BC8F8F'
, 'royalblue': '#4169E1'
, 'saddlebrown': '#8B4513'
, 'salmon': '#FA8072 '
, 'sandybrown': '#F4A460 '
, 'seagreen': '#2E8B57 '
, 'seashell': '#FFF5EE '
, 'sienna': '#A0522D '
, 'silver': '#C0C0C0 '
, 'skyblue': '#87CEEB '
, 'slateblue': '#6A5ACD '
, 'slategray': '#708090 '
, 'slategrey': '#708090 '
, 'salmon': '#FA8072'
, 'sandybrown': '#F4A460'
, 'seagreen': '#2E8B57'
, 'seashell': '#FFF5EE'
, 'sienna': '#A0522D'
, 'silver': '#C0C0C0'
, 'skyblue': '#87CEEB'
, 'slateblue': '#6A5ACD'
, 'slategray': '#708090'
, 'slategrey': '#708090'
, 'snow': '#FFFAFA'
, 'springgreen': '#00FF7F'
, 'steelblue': '#4682B4'
Expand Down Expand Up @@ -460,11 +460,11 @@
*/

function rgb2hex (rgb) {
rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
return "#" +
rgb = rgb.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i);
Copy link

Choose a reason for hiding this comment

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

rgba to hex would be a little more complicated - we shouldn't accept 'a' here since it won't correctly convert the color - it would be better to create a separate function rgba2hex with the correct logic instead of trying to overload this one

Copy link

Choose a reason for hiding this comment

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

I believe a more concise way to accomplish what you are trying to accomplish with [\s+]? would be \s*

return (rgb && rgb.length === 4) ? "#" +
Copy link

Choose a reason for hiding this comment

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

By nature of there being 3 capturing groups, a match will always have a length of 4 - can you elaborate on what is added by this check

Copy link

Choose a reason for hiding this comment

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

Putting error handling in for a non-match I think is a good idea - however I don't think it should silently fail like this - feel free to add a more explicit error to be thrown than the default, but I don't think returning an empty string should be expected functionality

("0" + parseInt(rgb[1],10).toString(16)).slice(-2) +
("0" + parseInt(rgb[2],10).toString(16)).slice(-2) +
("0" + parseInt(rgb[3],10).toString(16)).slice(-2);
("0" + parseInt(rgb[3],10).toString(16)).slice(-2) : '';
}

/**
Expand Down Expand Up @@ -868,7 +868,7 @@
}

/**
* Asserts that at least one currently selected element passes the given
* Asserts that at least one currently selected element passes the given
* assertion function.
*
* @param {Function} assertionFn
Expand Down Expand Up @@ -899,7 +899,7 @@
numFailedChildren < this.obj.length
, msg || 'expected ' + inspect(this.obj) + ' to have at least one ' +
'element that passed the any assertion'
, msg || 'expected ' + inspect(this.obj) + ' to have no elements that ' +
, msg || 'expected ' + inspect(this.obj) + ' to have no elements that ' +
'passed the any assertion'
);
return this;
Expand Down
Loading