Put the named color map in a variable (saves 37 bytes).

One-com · Mar 2, 2012 · 4371f83 · 4371f83
1 parent b991fcc
commit 4371f83
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/color-namedColors.js b/lib/color-namedColors.js
@@ -1,4 +1,5 @@
-ONECOLOR.namedColors = {
+/*global namedColors*/
+namedColors = {
     aliceblue: '#f0f8ff',
     antiquewhite: '#faebd7',
     aqua: '#00ffff',

diff --git a/lib/color.js b/lib/color.js
@@ -1,4 +1,5 @@
 var installedColorSpaces = [],
+    namedColors = {},
     channelRegExp = /\s*(\.\d+|\d+(?:\.\d+)?)(%)?\s*/,
     alphaChannelRegExp = /\s*(\.\d+|\d+(?:\.\d+)?)\s*/,
     cssColorRegExp = new RegExp(
@@ -20,11 +21,9 @@ function ONECOLOR (obj) {
             return new ONECOLOR[obj[0]](obj.slice(1, obj.length));
         }
     } else if (obj.charCodeAt) {
-        if (ONECOLOR.namedColors) {
+        var lowerCased = obj.toLowerCase();
-            var lowerCased = obj.toLowerCase();
+        if (namedColors[lowerCased]) {
-            if (ONECOLOR.namedColors[lowerCased]) {
+            obj = namedColors[lowerCased];
-                obj = ONECOLOR.namedColors[lowerCased];
-            }
         }
         // Test for CSS rgb(....) string
         var matchCssSyntax = obj.match(cssColorRegExp);

diff --git a/lib/color/_all.js b/lib/color/_all.js
@@ -2,10 +2,10 @@
 
 // This file is purely for the build system
 one.include('lib:color.js');
+one.include('lib:color-namedColors.js');
 one.include('lib:color/HSV.js');
 one.include('lib:color/HSL.js');
 one.include('lib:color/CMYK.js');
-one.include('lib:color-namedColors.js');
 
 // Convenience functions
 one.include('lib:color/plugins/clearer.js');