Fixes 174

claviska · Oct 6, 2015 · c3d57f4 · c3d57f4 · onassar · Oct 6, 2015
1 parent e1433b0
commit c3d57f4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/index.html b/index.html
@@ -620,8 +620,7 @@ <h3 id="methods">Methods</h3>
                 <dd>
                     <p>
                         Gets or sets a control's color value. To use this method as a setter, pass
-                        <code>data</code> in as a hex value. (You can also obtain this value by checking the
-                        input element's <code>value</code> attribute.)
+                        in a color string or an object (ex: <code>{color: '#fc0', opacity: .5}</code>).
                     </p>
                 </dd>
             </dl>

diff --git a/jquery.minicolors.js b/jquery.minicolors.js
@@ -115,7 +115,17 @@
                     } else {
                         // Setter
                         $(this).each( function() {
-                            updateFromInput($(this).val(data));
+                            if( typeof(data) === 'object' ) {
+                                if( data.opacity ) {
+                                    $(this).attr('data-opacity', keepWithin(data.opacity, 0, 1));
+                                }
+                                if( data.color ) {
+                                    $(this).val(data.color);
+                                }
+                            } else {
+                                $(this).val(data);
+                            }
+                            updateFromInput($(this));
                         });
                     }
                     return $(this);