Merge branch 'master' of https://github.com/claviska/jquery-minicolors

claviska · Dec 17, 2018 · 6bce29c · 6bce29c
2 parents deadf3d + a6e5b49
commit 6bce29c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/jquery.minicolors.js b/jquery.minicolors.js
@@ -146,6 +146,7 @@
     var size;
     var swatches;
     var swatch;
+    var swatchString;
     var panel;
     var i;
 
@@ -223,10 +224,11 @@
           name = '';
           swatch = settings.swatches[i];
         }
+        swatchString = swatch;
         swatch = isRgb(swatch) ? parseRgb(swatch, true) : hex2rgb(parseHex(swatch, true));
         $('<li class="minicolors-swatch minicolors-sprite"><span class="minicolors-swatch-color" title="' + name + '"></span></li>')
           .appendTo(swatches)
-          .data('swatch-color', settings.swatches[i])
+          .data('swatch-color', swatchString)
           .find('.minicolors-swatch-color')
           .css({
             backgroundColor: rgb2hex(swatch),
@@ -283,7 +285,7 @@
           if (settings.show) settings.show.call(input.get(0));
         });
     } else {
-      panel.css('opacity', 1);
+      panel.show();
       if (settings.show) settings.show.call(input.get(0));
     }
   }
@@ -302,7 +304,7 @@
           minicolors.removeClass('minicolors-focus');
         });
       } else {
-        panel.css('opacity', 0);
+        panel.hide();
         if (settings.hide) settings.hide.call(input.get(0));
         minicolors.removeClass('minicolors-focus');
       }