aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-18 16:28:18 -0700
committerJose Antonio Marquez2012-06-18 16:28:18 -0700
commit69f69c7bf43bdd9a80d8efe329cd648f975f14e9 (patch)
treebee1dcc413847838080cabbffcaf65ac7f239ca7 /js
parentfd79526fb7cb764811b0fbeec6f5dbd96c43707d (diff)
downloadninja-69f69c7bf43bdd9a80d8efe329cd648f975f14e9.tar.gz
Fixing binding of alpha slider/hottext in popup with panel
Diffstat (limited to 'js')
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js10
1 files changed, 1 insertions, 9 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
index ded06797..192c62fb 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.js
@@ -76,7 +76,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
76 this._components.combo.slider.element = this.alphaSlider; 76 this._components.combo.slider.element = this.alphaSlider;
77 this._components.combo.hottext.element = this.alphaHottext; 77 this._components.combo.hottext.element = this.alphaHottext;
78 // 78 //
79 Object.defineBinding(this._components.combo.hottext, "_value", { 79 Object.defineBinding(this._components.combo.hottext, "value", {
80 boundObject: this._components.combo.slider, 80 boundObject: this._components.combo.slider,
81 boundObjectPropertyPath: "value", 81 boundObjectPropertyPath: "value",
82 oneway: false, 82 oneway: false,
@@ -85,14 +85,6 @@ exports.ColorPanelPopup = Montage.create(Component, {
85 } 85 }
86 }); 86 });
87 // 87 //
88 Object.defineBinding(this._components.combo.hottext, "value", {
89 boundObject: this._components.combo.slider,
90 boundObjectPropertyPath: "value",
91 oneway: false,
92 boundValueMutator: function(value) {
93 return Math.round(value);
94 }
95 });
96 if (this.application.ninja.colorController.colorView) { 88 if (this.application.ninja.colorController.colorView) {
97 Object.defineBinding(this._components.combo.slider, "value", { 89 Object.defineBinding(this._components.combo.slider, "value", {
98 boundObject: this.application.ninja.colorController.colorView._combo[3].slider, 90 boundObject: this.application.ninja.colorController.colorView._combo[3].slider,