jquery-simplecolorpicker-rails 0.2.1 → 0.3.0

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

@@ -1,7 +1,7 @@
 module Jquery
   module Simplecolorpicker
     module Rails
-      VERSION = "0.2.1"
+      VERSION = "0.3.0"
     end
   end
 end

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

@@ -1,7 +1,8 @@
 /**
  * Very simple jQuery Color Picker.
+ * https://github.com/tkrotoff/jquery-simplecolorpicker
  *
- * Copyright (C) 2012 Tanguy Krotoff
+ * Copyright (C) 2012-2013 Tanguy Krotoff <tkrotoff@gmail.com>
  *
  * Licensed under the MIT license.
  */
@@ -41,7 +42,10 @@
 
       if (self.options.picker) {
         var selectText = self.$select.find('option:selected').text();
-        self.$icon = $('<span class="simplecolorpicker icon" title="' + selectText + '" style="background-color: ' + selectValue + ';" role="button" tabindex="0">'
+        self.$icon = $('<span class="simplecolorpicker icon"'
+                     + ' title="' + selectText + '"'
+                     + ' style="background-color: ' + selectValue + '"'
+                     + ' role="button" tabindex="0">'
                      + fakeText
                      + '</span>').insertAfter(self.$select);
         self.$icon.on('click.' + self.type, $.proxy(self.showPicker, self));
@@ -68,7 +72,11 @@
         if (option.prop('selected') === true || selectValue === color) {
           selected = 'class="selected"';
         }
-        colors += '<div ' + selected + ' title="' + title + '" style="background-color: ' + color + ';" role="button" tabindex="0">'
+        colors += '<div ' + selected
+                + ' title="' + title + '"'
+                + ' style="background-color: ' + color + '"'
+                + ' data-color="' + color + '"'
+                + ' role="button" tabindex="0">'
                 + fakeText
                 + '</div>';
       });
@@ -86,8 +94,7 @@
       var self = this;
 
       var colorDiv = self.$colorList.find('div').filter(function() {
-        var col = $(this).css('background-color');
-        return self.rgb2hex(col) === color;
+        return $(this).data('color') === color;
       });
 
       if (colorDiv.length > 0) {
@@ -119,7 +126,7 @@
      * It also changes the HTML select value, this will emit the 'change' event.
      */
     selectColorDiv: function(colorDiv) {
-      var color = colorDiv.css('background-color');
+      var color = colorDiv.data('color');
       var title = colorDiv.prop('title');
 
       // Mark this div as the selected one
@@ -133,7 +140,7 @@
       }
 
       // Change HTML select value
-      this.$select.val(this.rgb2hex(color));
+      this.$select.val(color);
     },
 
     /**
@@ -158,26 +165,6 @@
       e.preventDefault();
     },
 
-    /**
-     * Converts a RGB color to its hexadecimal value.
-     *
-     * See http://stackoverflow.com/questions/1740700/get-hex-value-rather-than-rgb-value-using-jquery
-     */
-    rgb2hex: function(rgb) {
-      function hex(x) {
-        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]);
-      }
-    },
-
     destroy: function() {
       if (this.options.picker) {
         this.$icon.off('.' + this.type);

data/vendor/assets/stylesheets/jquery.simplecolorpicker.css

@@ -1,7 +1,8 @@
 /**
  * Very simple jQuery Color Picker CSS.
+ * https://github.com/tkrotoff/jquery-simplecolorpicker
  *
- * Copyright (C) 2012 Tanguy Krotoff
+ * Copyright (C) 2012-2013 Tanguy Krotoff <tkrotoff@gmail.com>
  *
  * Licensed under the MIT license.
  *

metadata

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