jquery-simplecolorpicker-rails 0.3.0 → 0.4.0

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

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

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

@@ -1,10 +1,10 @@
-/**
- * Very simple jQuery Color Picker.
+/*
+ * Very simple jQuery Color Picker
  * https://github.com/tkrotoff/jquery-simplecolorpicker
  *
  * Copyright (C) 2012-2013 Tanguy Krotoff <tkrotoff@gmail.com>
  *
- * Licensed under the MIT license.
+ * Licensed under the MIT license
  */
 
 (function($) {
@@ -44,7 +44,7 @@
         var selectText = self.$select.find('option:selected').text();
         self.$icon = $('<span class="simplecolorpicker icon"'
                      + ' title="' + selectText + '"'
-                     + ' style="background-color: ' + selectValue + '"'
+                     + ' style="background-color: ' + selectValue + ';"'
                      + ' role="button" tabindex="0">'
                      + fakeText
                      + '</span>').insertAfter(self.$select);
@@ -62,7 +62,7 @@
       }
 
       // Build the list of colors
-      // <div class="selected" title="Green" style="background-color: #7bd148;" role="button"></div>
+      // <span class="selected" title="Green" style="background-color: #7bd148;" role="button"></span>
       var colors = '';
       $('option', self.$select).each(function() {
         var option = $(this);
@@ -72,13 +72,13 @@
         if (option.prop('selected') === true || selectValue === color) {
           selected = 'class="selected"';
         }
-        colors += '<div ' + selected
+        colors += '<span ' + selected
                 + ' title="' + title + '"'
-                + ' style="background-color: ' + color + '"'
+                + ' style="background-color: ' + color + ';"'
                 + ' data-color="' + color + '"'
                 + ' role="button" tabindex="0">'
                 + fakeText
-                + '</div>';
+                + '</span>';
       });
 
       self.$colorList.html(colors);
@@ -93,12 +93,12 @@
     selectColor: function(color) {
       var self = this;
 
-      var colorDiv = self.$colorList.find('div').filter(function() {
-        return $(this).data('color') === color;
+      var colorSpan = self.$colorList.find('span').filter(function() {
+        return $(this).data('color').toLowerCase() === color.toLowerCase();
       });
 
-      if (colorDiv.length > 0) {
-        self.selectColorDiv(colorDiv);
+      if (colorSpan.length > 0) {
+        self.selectColorSpan(colorSpan);
       } else {
         console.error("The given color '" + color + "' could not be found");
       }
@@ -120,18 +120,18 @@
     },
 
     /**
-     * Selects the given div inside $colorList.
+     * Selects the given span inside $colorList.
      *
-     * The given div becomes the selected one.
+     * The given span becomes the selected one.
      * It also changes the HTML select value, this will emit the 'change' event.
      */
-    selectColorDiv: function(colorDiv) {
-      var color = colorDiv.data('color');
-      var title = colorDiv.prop('title');
+    selectColorSpan: function(colorSpan) {
+      var color = colorSpan.data('color');
+      var title = colorSpan.prop('title');
 
-      // Mark this div as the selected one
-      colorDiv.siblings().removeClass('selected');
-      colorDiv.addClass('selected');
+      // Mark this span as the selected one
+      colorSpan.siblings().removeClass('selected');
+      colorSpan.addClass('selected');
 
       if (this.options.picker) {
         this.$icon.css('background-color', color);
@@ -144,14 +144,14 @@
     },
 
     /**
-     * The user clicked on a div inside $colorList.
+     * The user clicked on a span inside $colorList.
      */
     click: function(e) {
       var target = $(e.target);
       if (target.length === 1) {
-        if (target[0].nodeName.toLowerCase() === 'div') {
+        if (target[0].nodeName.toLowerCase() === 'span') {
           // When you click on a color, make it the new selected one
-          this.selectColorDiv(target);
+          this.selectColorSpan(target);
           this.$select.trigger('change');
         }
       }

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

@@ -1,11 +1,13 @@
-/**
- * Very simple jQuery Color Picker CSS.
+/*
+ * Very simple jQuery Color Picker
  * https://github.com/tkrotoff/jquery-simplecolorpicker
  *
  * Copyright (C) 2012-2013 Tanguy Krotoff <tkrotoff@gmail.com>
  *
- * Licensed under the MIT license.
- *
+ * Licensed under the MIT license
+ */
+
+/**
  * Inspired by Bootstrap Twitter.
  * See https://github.com/twitter/bootstrap/blob/master/less/dropdowns.less
  * See http://twitter.github.com/bootstrap/assets/css/bootstrap.css
@@ -76,7 +78,7 @@
   }
 
   .simplecolorpicker.icon,
-  .simplecolorpicker div {
+  .simplecolorpicker span {
     cursor: pointer;
     display: inline-block;
 
@@ -86,11 +88,11 @@
 
     border: 1px solid transparent;
   }
-  .simplecolorpicker div {
+  .simplecolorpicker span {
     margin: 0 4px 4px 0;
   }
 
-  .simplecolorpicker div:hover,
-  .simplecolorpicker div.selected {
+  .simplecolorpicker span:hover,
+  .simplecolorpicker span.selected {
     border: 1px solid black;
   }

metadata

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