diff options
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel')
-rwxr-xr-x | js/panels/color/colorpanelpopup.reel/colorpanelpopup.js | 4 |
1 files changed, 2 insertions, 2 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 | } |