aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js4
-rwxr-xr-xjs/panels/color/colorpopup-manager.js2
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, {
85 } 85 }
86 }); 86 });
87 // 87 //
88 if (this.application.ninja.colorController.colorView) { 88 if (this.application.ninja.colorController.colorView && this.props.panel) {
89 Object.defineBinding(this._components.combo.slider, "value", { 89 Object.defineBinding(this._components.combo.slider, "value", {
90 boundObject: this.application.ninja.colorController.colorView._combo[3].slider, 90 boundObject: this.application.ninja.colorController.colorView._combo[3].slider,
91 boundObjectPropertyPath: "value", 91 boundObjectPropertyPath: "value",
@@ -447,7 +447,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
447 // 447 //
448 this.application.ninja.colorController.colorView.removeButton('hexinput', this.inputHex); 448 this.application.ninja.colorController.colorView.removeButton('hexinput', this.inputHex);
449 Object.deleteBinding(this._components.combo.hottext, "value"); 449 Object.deleteBinding(this._components.combo.hottext, "value");
450 Object.deleteBinding(this._components.combo.slider, "value"); 450 if (this.props.panel) Object.deleteBinding(this._components.combo.slider, "value");
451 Object.deleteBinding(this._components.wheel, "value"); 451 Object.deleteBinding(this._components.wheel, "value");
452 this._components.wheel = null; 452 this._components.wheel = null;
453 } 453 }
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, {
206 // 206 //
207 this._popupBase = ColorPanelPopup.create(); 207 this._popupBase = ColorPanelPopup.create();
208 this._popupBase.element = popup; 208 this._popupBase.element = popup;
209 this._popupBase.props = {x: x, y: y, side: side, align: align, wheel: true, palette: true, gradient: true, image: true, nocolor: true, history: true}; 209 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};
210 this._popupBase.colorManager = this.colorManager; 210 this._popupBase.colorManager = this.colorManager;
211 // 211 //
212 this._popupBase.addEventListener('change', this, false); 212 this._popupBase.addEventListener('change', this, false);