Merge branch 'master' of https://github.com/owiber/spectrum

bgrins · Jan 13, 2014 · 0807bcc · 0807bcc
2 parents 9e13b6d + f8301b7
commit 0807bcc
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/spectrum.js b/spectrum.js
@@ -354,6 +354,9 @@
             draggable(slider, function (dragX, dragY) {
                 currentHue = parseFloat(dragY / slideHeight);
                 isEmpty = false;
+                if (!opts.showAlpha) {
+                    currentAlpha = 1;
+                }
                 move();
             }, dragStart, dragStop);
 
@@ -382,6 +385,9 @@
                 }
 
                 isEmpty = false;
+                if (!opts.showAlpha) {
+                    currentAlpha = 1;
+                }
 
                 move();
 
@@ -663,7 +669,7 @@
 
             // Get a format that alpha will be included in (hex and names ignore alpha)
             var format = currentPreferredFormat;
-            if (currentAlpha < 1) {
+            if (currentAlpha < 1 && !(currentAlpha === 0 && format === "name")) {
                 if (format === "hex" || format === "hex3" || format === "hex6" || format === "name") {
                     format = "rgb";
                 }