X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=rgbcolor%2Frgbcolor.js;h=bcdf94cf5238480237591e373e234e4b4804d3d2;hb=14ea2141f073e01b01708740414a17668a6aef3b;hp=b8b29d75cbf2e22a0ef5176725b6511b362cb983;hpb=a232a35c1f2a8c7f02d0e31f39745e7748c5227a;p=dygraphs.git

diff --git a/rgbcolor/rgbcolor.js b/rgbcolor/rgbcolor.js
index b8b29d7..bcdf94c 100644
--- a/rgbcolor/rgbcolor.js
+++ b/rgbcolor/rgbcolor.js
@@ -2,13 +2,29 @@
  * A class to parse color values
  *
  * NOTE: modified by danvk. I removed the "getHelpXML" function to reduce the
- * file size.
+ * file size, added "use strict" and a few "var" declarations where needed.
+ *
+ * Modifications by adilh:
+ * Original "RGBColor" function name collides with:
+ *   http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-RGBColor
+ * so renamed to "RGBColorParser"
+ *
+ * Modifications by konigsberg:
+ * Make Closure-compatible.
  *
  * @author Stoyan Stefanov <sstoo@gmail.com>
  * @link   http://www.phpied.com/rgb-color-parser-in-javascript/
  * @license Use it if you like it
  */
-function RGBColor(color_string)
+"use strict";
+
+/**
+ * Create a new instance.
+ *
+ * @param {string} color_string the string to be parsed.
+ * @constructor
+ */
+function RGBColorParser(color_string)
 {
     this.ok = false;
 
@@ -181,9 +197,9 @@ function RGBColor(color_string)
             example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
             process: function (bits){
                 return [
-                    parseInt(bits[1]),
-                    parseInt(bits[2]),
-                    parseInt(bits[3])
+                    parseInt(bits[1], 10),
+                    parseInt(bits[2], 10),
+                    parseInt(bits[3], 10)
                 ];
             }
         },
@@ -217,7 +233,7 @@ function RGBColor(color_string)
         var processor = color_defs[i].process;
         var bits = re.exec(color_string);
         if (bits) {
-            channels = processor(bits);
+            var channels = processor(bits);
             this.r = channels[0];
             this.g = channels[1];
             this.b = channels[2];