angularjs-color-picker - npm Package Compare versions

Comparing version 1.1.6 to 1.1.7

bower.json

 {
   "name": "angular-color-picker",
   "description": "Color Picker Directive For AngularJS",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "homepage": "https://github.com/ruhley/angular-color-picker",
@@ -6,0 +6,0 @@ "repository": {

dist/angularjs-color-picker.js

 /*!
- * angularjs-color-picker v1.1.6
+ * angularjs-color-picker v1.1.7
  * https://github.com/ruhley/angular-color-picker/
@@ -7,3 +7,3 @@ *
  *
- * 2016-06-23 08:36:52
+ * 2016-06-29 10:55:04
  *
@@ -101,3 +101,3 @@ */
                     if (!$scope.colorMouse && !$scope.hueMouse && !$scope.opacityMouse && $scope.find(event.target).length === 0) {
-                        $scope.log('Color Picker: Document Click Event');
+                        $scope.log('Document Click Event');
                         $scope.hide();
@@ -191,7 +191,7 @@ // mouse event on color grid
 
-                    $scope.log('Color Picker: Config', $scope.config);
+                    $scope.log('Config', $scope.config);
                 };
 
                 $scope.focus = function () {
-                    $scope.log('Color Picker: Focus Event');
+                    $scope.log('Focus Event');
                     $scope.find('.color-picker-input')[0].focus();
@@ -206,3 +206,3 @@ };
 
-                    $scope.log('Color Picker: Show Event');
+                    $scope.log('Show Event');
                     $scope.visible = true;
@@ -222,3 +222,3 @@ $scope.hueMouse = false;
                     if (!$scope.config.inline && ($scope.visible || element[0].querySelector('.color-picker-panel').offsetParent !== null)) {
-                        $scope.log('Color Picker: Hide Event');
+                        $scope.log('Hide Event');
 
@@ -262,3 +262,3 @@ $scope.visible = false;
 
-                    $scope.log('Color Picker: COLOR CHANGED TO ', color, $scope.hue, $scope.saturation, $scope.lightness, $scope.opacity);
+                    $scope.log('COLOR CHANGED TO ', color, $scope.hue, $scope.saturation, $scope.lightness, $scope.opacity);
 
@@ -313,3 +313,3 @@ $scope.swatchColor = color.toHslString();
                     if (newValue !== undefined && newValue !== null && newValue !== oldValue && newValue.length > 4) {
-                        $scope.log('Color Picker: MODEL - CHANGED', newValue);
+                        $scope.log('MODEL - CHANGED', newValue);
                         var color = tinycolor(newValue);
@@ -458,3 +458,3 @@
 
-                    $scope.log('Color Picker: HUE - MOUSE DOWN');
+                    $scope.log('HUE - MOUSE DOWN');
                     $scope.hueMouse = true;
@@ -467,3 +467,3 @@ };
 
-                    $scope.log('Color Picker: HUE - MOUSE UP');
+                    $scope.log('HUE - MOUSE UP');
                     $scope.hueMouse = false;
@@ -476,3 +476,3 @@ };
 
-                    $scope.log('Color Picker: HUE - MOUSE CHANGE');
+                    $scope.log('HUE - MOUSE CHANGE');
                     var el = $scope.find('.color-picker-hue');
@@ -490,3 +490,3 @@ $scope.hue = (1 - ((event.pageY - $scope.offset(el).top) / el.prop('offsetHeight'))) * 360;
                     if ($scope.hue !== undefined) {
-                        $scope.log('Color Picker: HUE - CHANGED');
+                        $scope.log('HUE - CHANGED');
                         $scope.huePos = (1 - ($scope.hue / 360)) * 100;
@@ -507,3 +507,3 @@ $scope.grid = tinycolor({h: $scope.hue, s: 100, v: 1}).toHslString();
 
-                $scope.$watch('hue', function (newValue, oldValue) {
+                $scope.$watch('hue', function () {
                     $scope.hueUpdate();
@@ -519,3 +519,3 @@ });
 
-                    $scope.log('Color Picker: OPACITY - MOUSE DOWN');
+                    $scope.log('OPACITY - MOUSE DOWN');
                     $scope.opacityMouse = true;
@@ -528,3 +528,3 @@ };
 
-                    $scope.log('Color Picker: OPACITY - MOUSE UP');
+                    $scope.log('OPACITY - MOUSE UP');
                     $scope.opacityMouse = false;
@@ -537,3 +537,3 @@ };
 
-                    $scope.log('Color Picker: OPACITY - MOUSE CHANGE');
+                    $scope.log('OPACITY - MOUSE CHANGE');
                     var el = $scope.find('.color-picker-opacity');
@@ -551,3 +551,3 @@ $scope.opacity = (1 - ((event.pageY - $scope.offset(el).top) / el.prop('offsetHeight'))) * 100;
                     if ($scope.opacity !== undefined) {
-                        $scope.log('Color Picker: OPACITY - CHANGED');
+                        $scope.log('OPACITY - CHANGED');
                         $scope.opacityPos = (1 - ($scope.opacity / 100)) * 100;
@@ -566,3 +566,3 @@
 
-                $scope.$watch('opacity', function (newValue, oldValue) {
+                $scope.$watch('opacity', function () {
                     $scope.opacityUpdate();
@@ -578,3 +578,3 @@ });
 
-                    $scope.log('Color Picker: COLOR - MOUSE DOWN');
+                    $scope.log('COLOR - MOUSE DOWN');
                     $scope.colorMouse = true;
@@ -587,3 +587,3 @@ };
 
-                    $scope.log('Color Picker: COLOR - MOUSE UP');
+                    $scope.log('COLOR - MOUSE UP');
                     $scope.colorMouse = false;
@@ -596,3 +596,3 @@ };
 
-                    $scope.log('Color Picker: COLOR - MOUSE CHANGE');
+                    $scope.log('COLOR - MOUSE CHANGE');
                     var el = $scope.find('.color-picker-grid-inner');
@@ -618,4 +618,4 @@ var offset = $scope.offset(el);
                 $scope.saturationUpdate = function(oldValue) {
-                    if ($scope.saturation !== undefined && $scope.saturation !== oldValue) {
-                        $scope.log('Color Picker: SATURATION - CHANGED');
+                    if ($scope.saturation !== undefined) {
+                        $scope.log('SATURATION - CHANGED');
                         $scope.saturationPos = ($scope.saturation / 100) * 100;
@@ -634,9 +634,9 @@
 
-                $scope.$watch('saturation', function (newValue, oldValue) {
-                    $scope.saturationUpdate(oldValue);
+                $scope.$watch('saturation', function () {
+                    $scope.saturationUpdate();
                 });
 
-                $scope.lightnessUpdate = function(oldValue) {
-                    if ($scope.lightness !== undefined && $scope.lightness !== oldValue) {
-                        $scope.log('Color Picker: LIGHTNESS - CHANGED');
+                $scope.lightnessUpdate = function() {
+                    if ($scope.lightness !== undefined) {
+                        $scope.log('LIGHTNESS - CHANGED');
                         $scope.lightnessPos = (1 - ($scope.lightness / 100)) * 100;
@@ -655,4 +655,4 @@
 
-                $scope.$watch('lightness', function (newValue, oldValue) {
-                    $scope.lightnessUpdate(oldValue);
+                $scope.$watch('lightness', function () {
+                    $scope.lightnessUpdate();
                 });
@@ -665,3 +665,5 @@
                 $scope.log = function () {
+                    // arguments[0] = 'Color Picker: ' + arguments[0];
                     // console.log.apply(console, arguments);
+                    // console.trace();
                 };
@@ -668,0 +670,0 @@

dist/angularjs-color-picker.min.js

 /*!
- * angularjs-color-picker v1.1.6
+ * angularjs-color-picker v1.1.7
  * https://github.com/ruhley/angular-color-picker/
@@ -7,3 +7,3 @@ *
  *
- * 2016-06-23 08:36:52
+ * 2016-06-29 10:55:04
  *
@@ -23,9 +23,9 @@ */
 // no current mouse events and not an element in the picker
-c.colorMouse||c.hueMouse||c.opacityMouse||0!==c.find(a.target).length?c.colorMouse?(c.colorUp(a),c.$apply(),c.onChange(a)):c.hueMouse?(c.hueUp(a),c.$apply(),c.onChange(a)):c.opacityMouse&&(c.opacityUp(a),c.$apply(),c.onChange(a)):(c.log("Color Picker: Document Click Event"),c.hide())},c.onMouseMove=function(a){
+c.colorMouse||c.hueMouse||c.opacityMouse||0!==c.find(a.target).length?c.colorMouse?(c.colorUp(a),c.$apply(),c.onChange(a)):c.hueMouse?(c.hueUp(a),c.$apply(),c.onChange(a)):c.opacityMouse&&(c.opacityUp(a),c.$apply(),c.onChange(a)):(c.log("Document Click Event"),c.hide())},c.onMouseMove=function(a){
 // mouse event on color grid
-c.colorMouse?(c.colorChange(a),c.$apply()):c.hueMouse?(c.hueChange(a),c.$apply()):c.opacityMouse&&(c.opacityChange(a),c.$apply())},c.onColorClick=function(a){c.config.disabled||(c.colorChange(a),c.$apply(),c.onChange(a))},c.onHueClick=function(a){c.config.disabled||(c.hueChange(a),c.$apply(),c.onChange(a))},c.onOpacityClick=function(a){c.config.disabled||(c.opacityChange(a),c.$apply(),c.onChange(a))},c.onChange=function(a){c.ngModel!==c.onChangeValue&&(c.onChangeValue=c.ngModel,c.colorPickerOnChange({$event:a,color:c.ngModel}))},c.onBlur=function(){c.ngModel!==c.onChangeValue&&(c.updateModel=!0,c.update())},c.initConfig=function(){c.config={},c.config.disabled=void 0===c.colorPickerDisabled?!1:c.colorPickerDisabled,c.config.alpha=void 0===c.colorPickerAlpha?!0:c.colorPickerAlpha,c.config.case=void 0===c.colorPickerCase?"upper":c.colorPickerCase,c.config.format=void 0===c.colorPickerFormat?"hsl":c.colorPickerFormat,c.config.pos=void 0===c.colorPickerPos?"bottom left":c.colorPickerPos,c.config.swatch=void 0===c.colorPickerSwatch?!0:c.colorPickerSwatch,c.config.swatchOnly=void 0===c.colorPickerSwatchOnly?!1:c.colorPickerSwatchOnly,c.config.swatchPos=void 0===c.colorPickerSwatchPos?"left":c.colorPickerSwatchPos,c.config.swatchBootstrap=void 0===c.colorPickerSwatchBootstrap?!0:c.colorPickerSwatchBootstrap,c.config.inline=void 0===c.colorPickerInline?!1:c.colorPickerInline,c.visible=c.config.inline,c.log("Color Picker: Config",c.config)},c.focus=function(){c.log("Color Picker: Focus Event"),c.find(".color-picker-input")[0].focus()},c.show=function(){
+c.colorMouse?(c.colorChange(a),c.$apply()):c.hueMouse?(c.hueChange(a),c.$apply()):c.opacityMouse&&(c.opacityChange(a),c.$apply())},c.onColorClick=function(a){c.config.disabled||(c.colorChange(a),c.$apply(),c.onChange(a))},c.onHueClick=function(a){c.config.disabled||(c.hueChange(a),c.$apply(),c.onChange(a))},c.onOpacityClick=function(a){c.config.disabled||(c.opacityChange(a),c.$apply(),c.onChange(a))},c.onChange=function(a){c.ngModel!==c.onChangeValue&&(c.onChangeValue=c.ngModel,c.colorPickerOnChange({$event:a,color:c.ngModel}))},c.onBlur=function(){c.ngModel!==c.onChangeValue&&(c.updateModel=!0,c.update())},c.initConfig=function(){c.config={},c.config.disabled=void 0===c.colorPickerDisabled?!1:c.colorPickerDisabled,c.config.alpha=void 0===c.colorPickerAlpha?!0:c.colorPickerAlpha,c.config.case=void 0===c.colorPickerCase?"upper":c.colorPickerCase,c.config.format=void 0===c.colorPickerFormat?"hsl":c.colorPickerFormat,c.config.pos=void 0===c.colorPickerPos?"bottom left":c.colorPickerPos,c.config.swatch=void 0===c.colorPickerSwatch?!0:c.colorPickerSwatch,c.config.swatchOnly=void 0===c.colorPickerSwatchOnly?!1:c.colorPickerSwatchOnly,c.config.swatchPos=void 0===c.colorPickerSwatchPos?"left":c.colorPickerSwatchPos,c.config.swatchBootstrap=void 0===c.colorPickerSwatchBootstrap?!0:c.colorPickerSwatchBootstrap,c.config.inline=void 0===c.colorPickerInline?!1:c.colorPickerInline,c.visible=c.config.inline,c.log("Config",c.config)},c.focus=function(){c.log("Focus Event"),c.find(".color-picker-input")[0].focus()},c.show=function(){
 // if already visible then don't run show again
 // if already visible then don't run show again
 // force the sliders to re-caculate their position
-return c.visible?!0:(c.log("Color Picker: Show Event"),c.visible=!0,c.hueMouse=!1,c.opacityMouse=!1,c.colorMouse=!1,c.hueUpdate(),c.saturationUpdate(),c.lightnessUpdate(),void c.opacityUpdate())},c.hide=function(){c.config.inline||!c.visible&&null===d[0].querySelector(".color-picker-panel").offsetParent||(c.log("Color Picker: Hide Event"),c.visible=!1,c.$apply())},c.setDefaults=function(){void 0===c.hue&&(c.hue=0),void 0===c.saturation&&(c.saturation=0),void 0===c.lightness&&(c.lightness=100),void 0===c.opacity&&(c.opacity=100)},c.update=function(){if(void 0===c.hue&&void 0===c.saturation&&void 0===c.lightness)return!1;c.setDefaults();var a,b=tinycolor({h:c.hue,s:c.saturation/100,v:c.lightness/100});switch(c.config.alpha&&b.setAlpha(c.opacity/100),c.log("Color Picker: COLOR CHANGED TO ",b,c.hue,c.saturation,c.lightness,c.opacity),c.swatchColor=b.toHslString(),c.config.format){case"rgb":a=b.toRgbString();break;case"hex":a=b.toHexString(),a="lower"===c.config.case?a.toLowerCase():a.toUpperCase();break;case"hex8":a=b.toHex8String(),a="lower"===c.config.case?a.toLowerCase():a.toUpperCase();break;case"hsv":a=b.toHsvString();break;default:a=b.toHslString()}c.updateModel&&(c.ngModel=a)},c.updateSwatchBackground=function(){var a=angular.element(d[0].querySelector(".color-picker-swatch"));a.css({"background-color":c.swatchColor})},c.$watch("ngModel",function(a,d){if(void 0!==a&&null!==a&&a!==d&&a.length>4){c.log("Color Picker: MODEL - CHANGED",a);var g=tinycolor(a);if(g.isValid()){var h=g.toHsv();c.updateModel=!1,c.hue=h.h,c.saturation=100*h.s,c.lightness=100*h.v,c.config.alpha&&(c.opacity=100*h.a),b(function(){c.updateModel=!0}),c.isValid=!0}else c.isValid=!1;f[0].$setValidity(e.name,c.isValid),void 0!==d&&"function"==typeof f[0].$setDirty&&f[0].$setDirty()}else null!==a&&""!==a||(c.hue=void 0,c.saturation=void 0,c.lightness=void 0,c.opacity=void 0),c.swatchColor=""}),c.$watchGroup(["colorPickerFormat","colorPickerAlpha","colorPickerCase"],function(a,b){void 0!==a&&(c.initConfig(),c.update())}),c.$watchGroup(["colorPickerDisabled","colorPickerSwatchBootstrap","colorPickerSwatchOnly","colorPickerSwatch","colorPickerPos","colorPickerInline"],function(a,b){void 0!==a&&c.initConfig()}),c.$watch("colorPickerSwatchPos",function(a,d){void 0!==a&&(c.initConfig(),b(function(){c.updateSwatchBackground()}))}),
+return c.visible?!0:(c.log("Show Event"),c.visible=!0,c.hueMouse=!1,c.opacityMouse=!1,c.colorMouse=!1,c.hueUpdate(),c.saturationUpdate(),c.lightnessUpdate(),void c.opacityUpdate())},c.hide=function(){c.config.inline||!c.visible&&null===d[0].querySelector(".color-picker-panel").offsetParent||(c.log("Hide Event"),c.visible=!1,c.$apply())},c.setDefaults=function(){void 0===c.hue&&(c.hue=0),void 0===c.saturation&&(c.saturation=0),void 0===c.lightness&&(c.lightness=100),void 0===c.opacity&&(c.opacity=100)},c.update=function(){if(void 0===c.hue&&void 0===c.saturation&&void 0===c.lightness)return!1;c.setDefaults();var a,b=tinycolor({h:c.hue,s:c.saturation/100,v:c.lightness/100});switch(c.config.alpha&&b.setAlpha(c.opacity/100),c.log("COLOR CHANGED TO ",b,c.hue,c.saturation,c.lightness,c.opacity),c.swatchColor=b.toHslString(),c.config.format){case"rgb":a=b.toRgbString();break;case"hex":a=b.toHexString(),a="lower"===c.config.case?a.toLowerCase():a.toUpperCase();break;case"hex8":a=b.toHex8String(),a="lower"===c.config.case?a.toLowerCase():a.toUpperCase();break;case"hsv":a=b.toHsvString();break;default:a=b.toHslString()}c.updateModel&&(c.ngModel=a)},c.updateSwatchBackground=function(){var a=angular.element(d[0].querySelector(".color-picker-swatch"));a.css({"background-color":c.swatchColor})},c.$watch("ngModel",function(a,d){if(void 0!==a&&null!==a&&a!==d&&a.length>4){c.log("MODEL - CHANGED",a);var g=tinycolor(a);if(g.isValid()){var h=g.toHsv();c.updateModel=!1,c.hue=h.h,c.saturation=100*h.s,c.lightness=100*h.v,c.config.alpha&&(c.opacity=100*h.a),b(function(){c.updateModel=!0}),c.isValid=!0}else c.isValid=!1;f[0].$setValidity(e.name,c.isValid),void 0!==d&&"function"==typeof f[0].$setDirty&&f[0].$setDirty()}else null!==a&&""!==a||(c.hue=void 0,c.saturation=void 0,c.lightness=void 0,c.opacity=void 0),c.swatchColor=""}),c.$watchGroup(["colorPickerFormat","colorPickerAlpha","colorPickerCase"],function(a,b){void 0!==a&&(c.initConfig(),c.update())}),c.$watchGroup(["colorPickerDisabled","colorPickerSwatchBootstrap","colorPickerSwatchOnly","colorPickerSwatch","colorPickerPos","colorPickerInline"],function(a,b){void 0!==a&&c.initConfig()}),c.$watch("colorPickerSwatchPos",function(a,d){void 0!==a&&(c.initConfig(),b(function(){c.updateSwatchBackground()}))}),
 //---------------------------
@@ -38,11 +38,11 @@ // Update Positions And Colors On Elements
 //---------------------------
-c.hueDown=function(a){a.stopPropagation(),a.preventDefault(),c.log("Color Picker: HUE - MOUSE DOWN"),c.hueMouse=!0},c.hueUp=function(a){a.stopPropagation(),a.preventDefault(),c.log("Color Picker: HUE - MOUSE UP"),c.hueMouse=!1},c.hueChange=function(a){a.stopPropagation(),a.preventDefault(),c.log("Color Picker: HUE - MOUSE CHANGE");var b=c.find(".color-picker-hue");c.hue=360*(1-(a.pageY-c.offset(b).top)/b.prop("offsetHeight")),c.hue>360?c.hue=360:c.hue<0&&(c.hue=0)},c.hueUpdate=function(){void 0!==c.hue&&(c.log("Color Picker: HUE - CHANGED"),c.huePos=100*(1-c.hue/360),c.grid=tinycolor({h:c.hue,s:100,v:1}).toHslString(),c.huePos<0?c.huePos=0:c.huePos>100&&(c.huePos=100),c.huePosUpdate(),c.gridUpdate(),c.update())},c.$watch("hue",function(a,b){c.hueUpdate()}),
+c.hueDown=function(a){a.stopPropagation(),a.preventDefault(),c.log("HUE - MOUSE DOWN"),c.hueMouse=!0},c.hueUp=function(a){a.stopPropagation(),a.preventDefault(),c.log("HUE - MOUSE UP"),c.hueMouse=!1},c.hueChange=function(a){a.stopPropagation(),a.preventDefault(),c.log("HUE - MOUSE CHANGE");var b=c.find(".color-picker-hue");c.hue=360*(1-(a.pageY-c.offset(b).top)/b.prop("offsetHeight")),c.hue>360?c.hue=360:c.hue<0&&(c.hue=0)},c.hueUpdate=function(){void 0!==c.hue&&(c.log("HUE - CHANGED"),c.huePos=100*(1-c.hue/360),c.grid=tinycolor({h:c.hue,s:100,v:1}).toHslString(),c.huePos<0?c.huePos=0:c.huePos>100&&(c.huePos=100),c.huePosUpdate(),c.gridUpdate(),c.update())},c.$watch("hue",function(){c.hueUpdate()}),
 //---------------------------
 // OPACITY
 //---------------------------
-c.opacityDown=function(a){a.stopPropagation(),a.preventDefault(),c.log("Color Picker: OPACITY - MOUSE DOWN"),c.opacityMouse=!0},c.opacityUp=function(a){a.stopPropagation(),a.preventDefault(),c.log("Color Picker: OPACITY - MOUSE UP"),c.opacityMouse=!1},c.opacityChange=function(a){a.stopPropagation(),a.preventDefault(),c.log("Color Picker: OPACITY - MOUSE CHANGE");var b=c.find(".color-picker-opacity");c.opacity=100*(1-(a.pageY-c.offset(b).top)/b.prop("offsetHeight")),c.opacity>100?c.opacity=100:c.opacity<0&&(c.opacity=0)},c.opacityUpdate=function(){void 0!==c.opacity&&(c.log("Color Picker: OPACITY - CHANGED"),c.opacityPos=100*(1-c.opacity/100),c.opacityPos<0?c.opacityPos=0:c.opacityPos>100&&(c.opacityPos=100),c.opacityPosUpdate(),c.update())},c.$watch("opacity",function(a,b){c.opacityUpdate()}),
+c.opacityDown=function(a){a.stopPropagation(),a.preventDefault(),c.log("OPACITY - MOUSE DOWN"),c.opacityMouse=!0},c.opacityUp=function(a){a.stopPropagation(),a.preventDefault(),c.log("OPACITY - MOUSE UP"),c.opacityMouse=!1},c.opacityChange=function(a){a.stopPropagation(),a.preventDefault(),c.log("OPACITY - MOUSE CHANGE");var b=c.find(".color-picker-opacity");c.opacity=100*(1-(a.pageY-c.offset(b).top)/b.prop("offsetHeight")),c.opacity>100?c.opacity=100:c.opacity<0&&(c.opacity=0)},c.opacityUpdate=function(){void 0!==c.opacity&&(c.log("OPACITY - CHANGED"),c.opacityPos=100*(1-c.opacity/100),c.opacityPos<0?c.opacityPos=0:c.opacityPos>100&&(c.opacityPos=100),c.opacityPosUpdate(),c.update())},c.$watch("opacity",function(){c.opacityUpdate()}),
 //---------------------------
 // COLOR
 //---------------------------
-c.colorDown=function(a){a.stopPropagation(),a.preventDefault(),c.log("Color Picker: COLOR - MOUSE DOWN"),c.colorMouse=!0},c.colorUp=function(a){a.stopPropagation(),a.preventDefault(),c.log("Color Picker: COLOR - MOUSE UP"),c.colorMouse=!1},c.colorChange=function(a){a.stopPropagation(),a.preventDefault(),c.log("Color Picker: COLOR - MOUSE CHANGE");var b=c.find(".color-picker-grid-inner"),d=c.offset(b);c.saturation=(a.pageX-d.left)/b.prop("offsetWidth")*100,c.lightness=100*(1-(a.pageY-d.top)/b.prop("offsetHeight")),c.saturation>100?c.saturation=100:c.saturation<0&&(c.saturation=0),c.lightness>100?c.lightness=100:c.lightness<0&&(c.lightness=0)},c.saturationUpdate=function(a){void 0!==c.saturation&&c.saturation!==a&&(c.log("Color Picker: SATURATION - CHANGED"),c.saturationPos=c.saturation/100*100,c.saturationPos<0?c.saturationPos=0:c.saturationPos>100&&(c.saturationPos=100),c.saturationPosUpdate(),c.update())},c.$watch("saturation",function(a,b){c.saturationUpdate(b)}),c.lightnessUpdate=function(a){void 0!==c.lightness&&c.lightness!==a&&(c.log("Color Picker: LIGHTNESS - CHANGED"),c.lightnessPos=100*(1-c.lightness/100),c.lightnessPos<0?c.lightnessPos=0:c.lightnessPos>100&&(c.lightnessPos=100),c.lightnessPosUpdate(),c.update())},c.$watch("lightness",function(a,b){c.lightnessUpdate(b)}),
+c.colorDown=function(a){a.stopPropagation(),a.preventDefault(),c.log("COLOR - MOUSE DOWN"),c.colorMouse=!0},c.colorUp=function(a){a.stopPropagation(),a.preventDefault(),c.log("COLOR - MOUSE UP"),c.colorMouse=!1},c.colorChange=function(a){a.stopPropagation(),a.preventDefault(),c.log("COLOR - MOUSE CHANGE");var b=c.find(".color-picker-grid-inner"),d=c.offset(b);c.saturation=(a.pageX-d.left)/b.prop("offsetWidth")*100,c.lightness=100*(1-(a.pageY-d.top)/b.prop("offsetHeight")),c.saturation>100?c.saturation=100:c.saturation<0&&(c.saturation=0),c.lightness>100?c.lightness=100:c.lightness<0&&(c.lightness=0)},c.saturationUpdate=function(a){void 0!==c.saturation&&(c.log("SATURATION - CHANGED"),c.saturationPos=c.saturation/100*100,c.saturationPos<0?c.saturationPos=0:c.saturationPos>100&&(c.saturationPos=100),c.saturationPosUpdate(),c.update())},c.$watch("saturation",function(){c.saturationUpdate()}),c.lightnessUpdate=function(){void 0!==c.lightness&&(c.log("LIGHTNESS - CHANGED"),c.lightnessPos=100*(1-c.lightness/100),c.lightnessPos<0?c.lightnessPos=0:c.lightnessPos>100&&(c.lightnessPos=100),c.lightnessPosUpdate(),c.update())},c.$watch("lightness",function(){c.lightnessUpdate()}),
 //---------------------------
@@ -49,0 +49,0 @@ // HELPER FUNCTIONS

lib/scripts/directive.js

@@ -81,3 +81,3 @@ (function() {
                     if (!$scope.colorMouse && !$scope.hueMouse && !$scope.opacityMouse && $scope.find(event.target).length === 0) {
-                        $scope.log('Color Picker: Document Click Event');
+                        $scope.log('Document Click Event');
                         $scope.hide();
@@ -171,7 +171,7 @@ // mouse event on color grid
 
-                    $scope.log('Color Picker: Config', $scope.config);
+                    $scope.log('Config', $scope.config);
                 };
 
                 $scope.focus = function () {
-                    $scope.log('Color Picker: Focus Event');
+                    $scope.log('Focus Event');
                     $scope.find('.color-picker-input')[0].focus();
@@ -186,3 +186,3 @@ };
 
-                    $scope.log('Color Picker: Show Event');
+                    $scope.log('Show Event');
                     $scope.visible = true;
@@ -202,3 +202,3 @@ $scope.hueMouse = false;
                     if (!$scope.config.inline && ($scope.visible || element[0].querySelector('.color-picker-panel').offsetParent !== null)) {
-                        $scope.log('Color Picker: Hide Event');
+                        $scope.log('Hide Event');
 
@@ -242,3 +242,3 @@ $scope.visible = false;
 
-                    $scope.log('Color Picker: COLOR CHANGED TO ', color, $scope.hue, $scope.saturation, $scope.lightness, $scope.opacity);
+                    $scope.log('COLOR CHANGED TO ', color, $scope.hue, $scope.saturation, $scope.lightness, $scope.opacity);
 
@@ -293,3 +293,3 @@ $scope.swatchColor = color.toHslString();
                     if (newValue !== undefined && newValue !== null && newValue !== oldValue && newValue.length > 4) {
-                        $scope.log('Color Picker: MODEL - CHANGED', newValue);
+                        $scope.log('MODEL - CHANGED', newValue);
                         var color = tinycolor(newValue);
@@ -438,3 +438,3 @@
 
-                    $scope.log('Color Picker: HUE - MOUSE DOWN');
+                    $scope.log('HUE - MOUSE DOWN');
                     $scope.hueMouse = true;
@@ -447,3 +447,3 @@ };
 
-                    $scope.log('Color Picker: HUE - MOUSE UP');
+                    $scope.log('HUE - MOUSE UP');
                     $scope.hueMouse = false;
@@ -456,3 +456,3 @@ };
 
-                    $scope.log('Color Picker: HUE - MOUSE CHANGE');
+                    $scope.log('HUE - MOUSE CHANGE');
                     var el = $scope.find('.color-picker-hue');
@@ -470,3 +470,3 @@ $scope.hue = (1 - ((event.pageY - $scope.offset(el).top) / el.prop('offsetHeight'))) * 360;
                     if ($scope.hue !== undefined) {
-                        $scope.log('Color Picker: HUE - CHANGED');
+                        $scope.log('HUE - CHANGED');
                         $scope.huePos = (1 - ($scope.hue / 360)) * 100;
@@ -487,3 +487,3 @@ $scope.grid = tinycolor({h: $scope.hue, s: 100, v: 1}).toHslString();
 
-                $scope.$watch('hue', function (newValue, oldValue) {
+                $scope.$watch('hue', function () {
                     $scope.hueUpdate();
@@ -499,3 +499,3 @@ });
 
-                    $scope.log('Color Picker: OPACITY - MOUSE DOWN');
+                    $scope.log('OPACITY - MOUSE DOWN');
                     $scope.opacityMouse = true;
@@ -508,3 +508,3 @@ };
 
-                    $scope.log('Color Picker: OPACITY - MOUSE UP');
+                    $scope.log('OPACITY - MOUSE UP');
                     $scope.opacityMouse = false;
@@ -517,3 +517,3 @@ };
 
-                    $scope.log('Color Picker: OPACITY - MOUSE CHANGE');
+                    $scope.log('OPACITY - MOUSE CHANGE');
                     var el = $scope.find('.color-picker-opacity');
@@ -531,3 +531,3 @@ $scope.opacity = (1 - ((event.pageY - $scope.offset(el).top) / el.prop('offsetHeight'))) * 100;
                     if ($scope.opacity !== undefined) {
-                        $scope.log('Color Picker: OPACITY - CHANGED');
+                        $scope.log('OPACITY - CHANGED');
                         $scope.opacityPos = (1 - ($scope.opacity / 100)) * 100;
@@ -546,3 +546,3 @@
 
-                $scope.$watch('opacity', function (newValue, oldValue) {
+                $scope.$watch('opacity', function () {
                     $scope.opacityUpdate();
@@ -558,3 +558,3 @@ });
 
-                    $scope.log('Color Picker: COLOR - MOUSE DOWN');
+                    $scope.log('COLOR - MOUSE DOWN');
                     $scope.colorMouse = true;
@@ -567,3 +567,3 @@ };
 
-                    $scope.log('Color Picker: COLOR - MOUSE UP');
+                    $scope.log('COLOR - MOUSE UP');
                     $scope.colorMouse = false;
@@ -576,3 +576,3 @@ };
 
-                    $scope.log('Color Picker: COLOR - MOUSE CHANGE');
+                    $scope.log('COLOR - MOUSE CHANGE');
                     var el = $scope.find('.color-picker-grid-inner');
@@ -598,4 +598,4 @@ var offset = $scope.offset(el);
                 $scope.saturationUpdate = function(oldValue) {
-                    if ($scope.saturation !== undefined && $scope.saturation !== oldValue) {
-                        $scope.log('Color Picker: SATURATION - CHANGED');
+                    if ($scope.saturation !== undefined) {
+                        $scope.log('SATURATION - CHANGED');
                         $scope.saturationPos = ($scope.saturation / 100) * 100;
@@ -614,9 +614,9 @@
 
-                $scope.$watch('saturation', function (newValue, oldValue) {
-                    $scope.saturationUpdate(oldValue);
+                $scope.$watch('saturation', function () {
+                    $scope.saturationUpdate();
                 });
 
-                $scope.lightnessUpdate = function(oldValue) {
-                    if ($scope.lightness !== undefined && $scope.lightness !== oldValue) {
-                        $scope.log('Color Picker: LIGHTNESS - CHANGED');
+                $scope.lightnessUpdate = function() {
+                    if ($scope.lightness !== undefined) {
+                        $scope.log('LIGHTNESS - CHANGED');
                         $scope.lightnessPos = (1 - ($scope.lightness / 100)) * 100;
@@ -635,4 +635,4 @@
 
-                $scope.$watch('lightness', function (newValue, oldValue) {
-                    $scope.lightnessUpdate(oldValue);
+                $scope.$watch('lightness', function () {
+                    $scope.lightnessUpdate();
                 });
@@ -645,3 +645,5 @@
                 $scope.log = function () {
+                    // arguments[0] = 'Color Picker: ' + arguments[0];
                     // console.log.apply(console, arguments);
+                    // console.trace();
                 };
@@ -648,0 +650,0 @@

package.json

 {
   "name": "angularjs-color-picker",
   "description": "Color Picker Directive For AngularJS",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "license": "MIT",
@@ -6,0 +6,0 @@ "main": "dist/angularjs-color-picker.min.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

464544

increased by1.22%

Number of package files

43

increased by4.88%

Lines of code

2284

increased by0.62%

No dependency changes