jquery-simplecolorpicker-rails 0.0.1 → 0.0.2

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+.DS_Store
+.idea/

data/lib/jquery-simplecolorpicker-rails/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Simplecolorpicker
     module Rails
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/vendor/assets/javascripts/jquery.simplecolorpicker.js

@@ -6,7 +6,8 @@
  * Licensed under the MIT license.
  */
 
-!function($) {
+(function($) {
+  "use strict";
 
   /**
    * Constructor.
@@ -33,16 +34,16 @@
         selected = 'class="selected"';
       }
       colorList += '<div ' + selected + ' title="' + title + '" style="background-color: ' + color + ';" role="button" tabindex="0">'
-                   + fakeText +
-                   '</div>';
+                   + fakeText
+                   + '</div>';
     });
 
     if (this.options.picker) {
       var selectText = this.select.find('option:selected').text();
       var selectValue = this.select.val();
       this.icon = $('<span class="simplecolorpicker icon" title="' + selectText + '" style="background-color: ' + selectValue + ';" role="button" tabindex="0">'
-                    + fakeText +
-                    '</span>').insertAfter(this.select);
+                    + fakeText
+                    + '</span>').insertAfter(this.select);
       this.icon.on('click', $.proxy(this.show, this));
 
       this.picker = $('<span class="simplecolorpicker picker"></span>').appendTo(document.body);
@@ -57,7 +58,7 @@
       this.inline.html(colorList);
       this.inline.on('click', $.proxy(this.click, this));
     }
-  }
+  };
 
   /**
    * SimpleColorPicker class.
@@ -82,31 +83,27 @@
 
     click: function(e) {
       var target = $(e.target);
-      if (target.length == 1) {
-        switch (target[0].nodeName.toLowerCase()) {
-
+      if (target.length === 1) {
+        if (target[0].nodeName.toLowerCase() === 'div') {
           // When you click on a color
-          case 'div':
-            var color = target.css('background-color');
-            var title = target.attr('title');
 
-            // Mark this div as the selected one
-            target.siblings().removeClass('selected');
-            target.addClass('selected');
+          var color = target.css('background-color');
+          var title = target.attr('title');
 
-            if (this.options.picker) {
-              this.icon.css('background-color', color);
-              this.icon.attr('title', title);
+          // Mark this div as the selected one
+          target.siblings().removeClass('selected');
+          target.addClass('selected');
 
-              // Hide the picker
-              this.hide();
-            }
+          if (this.options.picker) {
+            this.icon.css('background-color', color);
+            this.icon.attr('title', title);
 
-            // Change select value
-            this.select.val(this.rgb2hex(color)).change();
-
-            break;
+            // Hide the picker
+            this.hide();
+          }
 
+          // Change select value
+          this.select.val(this.rgb2hex(color)).change();
         }
       }
     },
@@ -125,29 +122,38 @@
      * See http://stackoverflow.com/questions/1740700/get-hex-value-rather-than-rgb-value-using-jquery
      */
     rgb2hex: function(rgb) {
-      rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
       function hex(x) {
-        return ("0" + parseInt(x).toString(16)).slice(-2);
+        return ("0" + parseInt(x, 10).toString(16)).slice(-2);
+      }
+
+      var matches = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
+      if (matches === null) {
+        // Fix for Internet Explorer < 9
+        // Variable rgb is already a hexadecimal value
+        return rgb;
+      } else {
+        return "#" + hex(matches[1]) + hex(matches[2]) + hex(matches[3]);
       }
-      return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
     }
-  }
+  };
 
   /**
    * Plugin definition.
    */
   $.fn.simplecolorpicker = function(option) {
     // For HTML element passed to the plugin
-    return this.each(function () {
+    return this.each(function() {
       var $this = $(this),
-      data = $this.data('simplecolorpicker'),
-      options = typeof option == 'object' && option;
+        data = $this.data('simplecolorpicker'),
+        options = typeof option === 'object' && option;
       if (!data) {
         $this.data('simplecolorpicker', (data = new SimpleColorPicker(this, options)));
       }
-      if (typeof option == 'string') data[option]();
+      if (typeof option === 'string') {
+        data[option]();
+      }
     });
-  }
+  };
 
   $.fn.simplecolorpicker.Constructor = SimpleColorPicker;
 
@@ -162,4 +168,4 @@
     picker: false
   };
 
-}(window.jQuery);
+})(jQuery);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-simplecolorpicker-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70305360074020 !ruby/object:Gem::Requirement
+  requirement: &18918120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70305360074020
+  version_requirements: *18918120
 description: simplecolorpicker jQuery plugin
 email:
 - tkrotoff@gmail.com
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: simplecolorpicker packaged for the Rails 3.1+ asset pipeline