Fixing alpha binding bug

The chip popup alpha sliders were binding to the panel when they shouldn't, so added a check.

2 files changed, 3 insertions, 3 deletions

diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
index c0d8118f..283de5a8 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
@@ -85,7 +85,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
                 }
                         });
                         //
-                        if (this.application.ninja.colorController.colorView) {
+                        if (this.application.ninja.colorController.colorView && this.props.panel) {
                         Object.defineBinding(this._components.combo.slider, "value", {
                                 boundObject: this.application.ninja.colorController.colorView._combo[3].slider,
                             boundObjectPropertyPath: "value",
@@ -447,7 +447,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
                 //
                 this.application.ninja.colorController.colorView.removeButton('hexinput', this.inputHex);
                 Object.deleteBinding(this._components.combo.hottext, "value");
-                Object.deleteBinding(this._components.combo.slider, "value");
+                if (this.props.panel) Object.deleteBinding(this._components.combo.slider, "value");
                 Object.deleteBinding(this._components.wheel, "value");
                 this._components.wheel = null;
         }
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index dc50154c..f04da850 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -206,7 +206,7 @@ exports.ColorPopupManager = Montage.create(Component, {
                         //
                         this._popupBase = ColorPanelPopup.create();
                         this._popupBase.element = popup;
-                        this._popupBase.props = {x: x, y: y, side: side, align: align, wheel: true, palette: true, gradient: true, image: true, nocolor: true, history: true};
+                        this._popupBase.props = {x: x, y: y, side: side, align: align, wheel: true, palette: true, gradient: true, image: true, nocolor: true, history: true, panel: true};
                         this._popupBase.colorManager = this.colorManager;
                         //
                         this._popupBase.addEventListener('change', this, false);