spectrum-rails 1.1.4 → 1.2.0

data/lib/spectrum-rails/version.rb

@@ -1,5 +1,5 @@
 module Spectrum
   module Rails
-    VERSION = "1.1.4"
+    VERSION = "1.2.0"
   end
 end

data/vendor/assets/javascripts/spectrum.js

@@ -1,4 +1,4 @@
-// Spectrum Colorpicker v1.1.2+
+// Spectrum Colorpicker v1.2.0
 // https://github.com/bgrins/spectrum
 // Author: Brian Grinstead
 // License: MIT
@@ -49,6 +49,10 @@
             style.cssText = 'background-color:rgba(0,0,0,.5)';
             return contains(style.backgroundColor, 'rgba') || contains(style.backgroundColor, 'hsla');
         })(),
+        inputTypeColorSupport = (function() {
+            var colorInput = $("<input type='color' value='!' />")[0];
+            return colorInput.type === "color" && colorInput.value !== "!";
+        })(),
         replaceInput = [
             "<div class='sp-replacer'>",
             "<div class='sp-preview'><div class='sp-preview-inner'></div></div>",
@@ -192,6 +196,7 @@
             clearButton = container.find(".sp-clear"),
             chooseButton = container.find(".sp-choose"),
             isInput = boundElement.is("input"),
+            isInputTypeColor = isInput && inputTypeColorSupport && boundElement.attr("type") === "color",
             shouldReplace = isInput && !flat,
             replacer = (shouldReplace) ? $(replaceInput).addClass(theme).addClass(opts.className) : $([]),
             offsetElement = (shouldReplace) ? replacer : boundElement,
@@ -202,8 +207,7 @@
             currentPreferredFormat = preferredFormat,
             clickoutFiresChange = !opts.showButtons || opts.clickoutFiresChange,
             isEmpty = !initialColor,
-            allowEmpty = opts.allowEmpty;
-
+            allowEmpty = opts.allowEmpty && !isInputTypeColor;
 
         function applyOptions() {
 
@@ -214,7 +218,7 @@
             container.toggleClass("sp-flat", flat);
             container.toggleClass("sp-input-disabled", !opts.showInput);
             container.toggleClass("sp-alpha-enabled", opts.showAlpha);
-            container.toggleClass("sp-clear-enabled", opts.allowEmpty);
+            container.toggleClass("sp-clear-enabled", allowEmpty);
             container.toggleClass("sp-buttons-disabled", !opts.showButtons);
             container.toggleClass("sp-palette-disabled", !opts.showPalette);
             container.toggleClass("sp-palette-only", opts.showPaletteOnly);
@@ -1076,10 +1080,7 @@
     $.spectrum.palettes = { };
 
     $.fn.spectrum.processNativeColorInputs = function () {
-        var colorInput = $("<input type='color' value='!' />")[0];
-        var supportsColor = colorInput.type === "color" && colorInput.value != "!";
-
-        if (!supportsColor) {
+        if (!inputTypeColorSupport) {
             $("input[type=color]").spectrum({
                 preferredFormat: "hex6"
             });

data/vendor/assets/stylesheets/spectrum.css

@@ -1,5 +1,5 @@
 /***
-Spectrum Colorpicker v1.1.2+
+Spectrum Colorpicker v1.2.0
 https://github.com/bgrins/spectrum
 Author: Brian Grinstead
 License: MIT

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectrum-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties