10 files changed, 109 insertions, 97 deletions

diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index d4737aad..3edaff86 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -198,7 +198,7 @@ exports.ColorController = Montage.create(Component, {
         enumerable: true,
         value: function (e) {
                 //
-            var actionEvent, color, input = e._event.input, panelMode, mode = e._event.mode;
+            var color, input = e._event.input, panelMode, mode = e._event.mode;
             if (this.colorView) {
                 panelMode = this.colorView.panelMode;
             }
diff --git a/js/models/color-model.js b/js/models/color-model.js
index 764feeb5..a2eab2e1 100755
--- a/js/models/color-model.js
+++ b/js/models/color-model.js
@@ -231,10 +231,10 @@ exports.ColorModel = Montage.create(Component, {
     //
     applyNoColor: {
         enumerable: true,
-        value: function () {
+        value: function (code) {
                 //
                 var nocolor = {};
-                nocolor.wasSetByCode = true;
+                nocolor.wasSetByCode = code;
                 nocolor.type = 'change';
                 this.updateColorSelected('nocolor', nocolor);
         }
@@ -310,29 +310,29 @@ exports.ColorModel = Montage.create(Component, {
                         case 'hex':
                                 switch (color.length) {
                                         case 1:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 2:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 3:
                                                 color = color[0]+color[0]+color[1]+color[1]+color[2]+color[2];
                                                 break;
                                         case 4:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 5:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 6:
                                                 //Nothing
                                                 break;
                                         default:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                 }
diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.js b/js/panels/color/colorchippopup.reel/colorchippopup.js
index 414be8b7..923beca9 100755
--- a/js/panels/color/colorchippopup.reel/colorchippopup.js
+++ b/js/panels/color/colorchippopup.reel/colorchippopup.js
@@ -43,8 +43,8 @@ exports.ColorChipPopup = Montage.create(Component, {
     //
     setNoColor: {
         enumerable: true,
-        value: function (e) {
-                this.colorManager.applyNoColor();
+        value: function (code) {
+                this.colorManager.applyNoColor(code);
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.js b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
index 7a28c55d..7071f590 100755
--- a/js/panels/color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.js
@@ -694,7 +694,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                 case 'nocolor':
                     this._buttons.nocolor.push(button);
                     button.title = 'No Color';
-                    button.addEventListener('click', this.setNoColor.bind(this));
+                    button.addEventListener('click', function () {this.setNoColor(false)}.bind(this));
                     break;
                 //////////////////////////////////////////////////////// 
                 case 'swap':
@@ -746,7 +746,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                 color.wasSetByCode = false;
                 //
                 if (prev.m === 'nocolor') {
-                    this.setNoColor();
+                    this.setNoColor(false);
                 } else {
                     this.colorManager.alpha = { value: alpha, wasSetByCode: true, type: 'change' };
                     this.colorManager[prev.m] = color;
@@ -832,11 +832,11 @@ exports.ColorPanelBase = Montage.create(Component, {
     //TODO: Add set by code property
     setNoColor: {
         enumerable: true,
-        value: function (e) {
+        value: function (wasSetByCode) {
             //
             this.application.ninja.colorController.colorPopupManager.hideColorPopup();
             //
-            this.colorManager.applyNoColor();
+            this.colorManager.applyNoColor(wasSetByCode);
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -879,7 +879,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                     break;
                 //////////////////////////////////////////////////////// 
                 default:
-                    this.setNoColor();
+                    this.setNoColor(false);
                     break;
                 //////////////////////////////////////////////////////// 
             }
@@ -911,7 +911,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                     break;
                 //////////////////////////////////////////////////////// 
                 default:
-                    this.setNoColor();
+                    this.setNoColor(false);
                     break;
                 //////////////////////////////////////////////////////// 
             }
@@ -1300,7 +1300,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                     update.type = 'change';
                     this.colorManager.hsl = update;
                 } else {
-                    this.colorManager.applyNoColor();
+                    this.colorManager.applyNoColor(false);
                 }
             } else {
                 update = this.colorManager.hexToRgb(color);
@@ -1309,7 +1309,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                     update.type = 'change';
                     this.colorManager.rgb = update;
                 } else {
-                    this.colorManager.applyNoColor();
+                    this.colorManager.applyNoColor(false);
                 }
             }
         }
@@ -1553,7 +1553,7 @@ exports.ColorPanelBase = Montage.create(Component, {
                         this.colorManager.hsv = color.c;
                         break;
                     default:
-                        this.colorManager.applyNoColor();
+                        this.colorManager.applyNoColor(true);
                         break;
                 }
                 //
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index 5ad5c615..596580b4 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
@@ -21,7 +21,18 @@
                     "images": {"#": "cntnr_images"},
                     "gradients": {"#": "cntnr_gradients"},
                     "palettes": {"#": "cntnr_palettes"},
-                    "alpha": {"#": "cntnr_alpha"}
+                    "alpha": {"#": "cntnr_alpha"},