1.2.0

Alberplz · Feb 23, 2016 · a049ad1 · a049ad1
1 parent 46d94b0
commit a049ad1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -25,8 +25,13 @@ Default option is the first item.
 <input color-picker 
        color-picker-model="var"
        color-picker-show-value="true, false"
-       color-picker-position = "right, left, top, bottom"
-       color-picker-fixed-position = "false, true"
+       color-picker-position="right, left, top, bottom"
+       color-picker-fixed-position="false, true"
+       color-picker-show-input-spinner="true"
+       color-picker-spinner-rgba-steps="1;1;1;0.1"
+       color-picker-spinner-hsla-steps="1;1;1;0.1"
+       color-picker-show-cancel-button="false, true"
+       color-picker-cancel-button-class="btn btn-default btn-xs"
   />
 ```
 

diff --git a/js/color-picker.js b/js/color-picker.js
@@ -267,8 +267,7 @@ colorPicker.directive('colorPicker', ['$document', '$compile', 'ColorHelper', fu
 
                 }],
             link: function (scope, element, attr) {
-                var template, close = false, initialValue = '';
-                initialValue = scope.colorPickerModel;
+                var template, close = false, initialValue = '';                
 
                 if (scope.colorPickerModel === undefined) {
                     scope.colorPickerModel = '#008fff';
@@ -392,6 +391,7 @@ colorPicker.directive('colorPicker', ['$document', '$compile', 'ColorHelper', fu
                 element.on('click', open);
                 function open(event) {
                     var box;
+                    initialValue = scope.colorPickerModel;
                     scope.$apply(function () {
                         scope.show = true;
                     });

diff --git a/js/color-picker.min.js b/js/color-picker.min.js