color-string 1.8.1 → 1.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +4 -4
- package/package.json +1 -1
package/index.js
CHANGED
|
@@ -3,7 +3,7 @@ var colorNames = require('color-name');
|
|
|
3
3
|
var swizzle = require('simple-swizzle');
|
|
4
4
|
var hasOwnProperty = Object.hasOwnProperty;
|
|
5
5
|
|
|
6
|
-
var reverseNames =
|
|
6
|
+
var reverseNames = Object.create(null);
|
|
7
7
|
|
|
8
8
|
// create a list of reverse color names
|
|
9
9
|
for (var name in colorNames) {
|
|
@@ -50,7 +50,7 @@ cs.get.rgb = function (string) {
|
|
|
50
50
|
|
|
51
51
|
var abbr = /^#([a-f0-9]{3,4})$/i;
|
|
52
52
|
var hex = /^#([a-f0-9]{6})([a-f0-9]{2})?$/i;
|
|
53
|
-
var rgba = /^rgba?\(\s*([+-]?\d+)\s
|
|
53
|
+
var rgba = /^rgba?\(\s*([+-]?\d+)(?=[\s,])\s*(?:,\s*)?([+-]?\d+)(?=[\s,])\s*(?:,\s*)?([+-]?\d+)\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
|
|
54
54
|
var per = /^rgba?\(\s*([+-]?[\d\.]+)\%\s*,?\s*([+-]?[\d\.]+)\%\s*,?\s*([+-]?[\d\.]+)\%\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
|
|
55
55
|
var keyword = /^(\w+)$/;
|
|
56
56
|
|
|
@@ -137,7 +137,7 @@ cs.get.hsl = function (string) {
|
|
|
137
137
|
return null;
|
|
138
138
|
}
|
|
139
139
|
|
|
140
|
-
var hsl = /^hsla?\(\s*([+-]?(?:\d{0,3}\.)?\d+)(?:deg)?\s*,?\s*([+-]?[\d\.]+)%\s*,?\s*([+-]?[\d\.]+)%\s*(?:[,|\/]\s*([+-]?[\d
|
|
140
|
+
var hsl = /^hsla?\(\s*([+-]?(?:\d{0,3}\.)?\d+)(?:deg)?\s*,?\s*([+-]?[\d\.]+)%\s*,?\s*([+-]?[\d\.]+)%\s*(?:[,|\/]\s*([+-]?(?=\.\d|\d)(?:0|[1-9]\d*)?(?:\.\d*)?(?:[eE][+-]?\d+)?)\s*)?\)$/;
|
|
141
141
|
var match = string.match(hsl);
|
|
142
142
|
|
|
143
143
|
if (match) {
|
|
@@ -158,7 +158,7 @@ cs.get.hwb = function (string) {
|
|
|
158
158
|
return null;
|
|
159
159
|
}
|
|
160
160
|
|
|
161
|
-
var hwb = /^hwb\(\s*([+-]?\d{0,3}(?:\.\d+)?)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d
|
|
161
|
+
var hwb = /^hwb\(\s*([+-]?\d{0,3}(?:\.\d+)?)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?(?=\.\d|\d)(?:0|[1-9]\d*)?(?:\.\d*)?(?:[eE][+-]?\d+)?)\s*)?\)$/;
|
|
162
162
|
var match = string.match(hwb);
|
|
163
163
|
|
|
164
164
|
if (match) {
|