Built motion from commit 943eae279.|1.0.24

[motion.git] / public / bower_components / angular-bootstrap-colorpicker / bootstrap-colorpicker-module.js

diff --git a/public/bower_components/angular-bootstrap-colorpicker/bootstrap-colorpicker-module.js b/public/bower_components/angular-bootstrap-colorpicker/bootstrap-colorpicker-module.js
index 987e37f..384931e 100644 (file)
--- a/public/bower_components/angular-bootstrap-colorpicker/bootstrap-colorpicker-module.js
+++ b/public/bower_components/angular-bootstrap-colorpicker/bootstrap-colorpicker-module.js
@@ -289,12 +289,7 @@ angular.module('colorpicker.module', [])
                       '</div>',
               colorpickerTemplate = angular.element(template),
               pickerColor = Color,
-              colorpickerValue = {
-                h: 1,
-                s: 0,
-                b: 1,
-                a: 1
-              },
+              componentSizePx,
               sliderAlpha,
               sliderHue = colorpickerTemplate.find('colorpicker-hue'),
               sliderSaturation = colorpickerTemplate.find('colorpicker-saturation'),
@@ -418,7 +413,7 @@ angular.module('colorpicker.module', [])
           }
 
           function mousemove(event) {
-            var
+            var 
                 left = Slider.getLeftPosition(event),
                 top = Slider.getTopPosition(event),
                 slider = Slider.getSlider();
@@ -450,7 +445,6 @@ angular.module('colorpicker.module', [])
           }
 
           function update(omitInnerInput) {
-            pickerColor.value = colorpickerValue;
             pickerColor.setColor(elem.val());
             if (withInput && !omitInnerInput) {
               pickerColorInput.val(elem.val());
@@ -461,7 +455,6 @@ angular.module('colorpicker.module', [])
             });
             pickerColorPointers.eq(1).css('top', componentSize * (1 - pickerColor.value.h) + 'px');
             pickerColorPointers.eq(2).css('top', componentSize * (1 - pickerColor.value.a) + 'px');
-            colorpickerValue = pickerColor.value;
             previewColor();
           }
 
@@ -522,7 +515,7 @@ angular.module('colorpicker.module', [])
 
               if (attrs.colorpickerIsOpen) {
                 $scope[attrs.colorpickerIsOpen] = true;
-                if (!$scope.$$phase || !$scope.$root.$$phase) {
+                if (!$scope.$$phase) {
                   $scope.$digest(); //trigger the watcher to fire
                 }
               }
@@ -558,7 +551,7 @@ angular.module('colorpicker.module', [])
 
               if (attrs.colorpickerIsOpen) {
                 $scope[attrs.colorpickerIsOpen] = false;
-                if (!$scope.$$phase || !$scope.$root.$$phase) {
+                if (!$scope.$$phase) {
                   $scope.$digest(); //trigger the watcher to fire
                 }
               }