aboutsummaryrefslogtreecommitdiff
path: root/js/components/hottextunit.reel/hottextunit.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-13 14:00:31 -0700
committerPushkar Joshi2012-06-13 14:00:31 -0700
commit596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch)
tree480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/hottextunit.reel/hottextunit.js
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/hottextunit.reel/hottextunit.js')
-rwxr-xr-xjs/components/hottextunit.reel/hottextunit.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/js/components/hottextunit.reel/hottextunit.js b/js/components/hottextunit.reel/hottextunit.js
index 448eb9d7..2a89db03 100755
--- a/js/components/hottextunit.reel/hottextunit.js
+++ b/js/components/hottextunit.reel/hottextunit.js
@@ -40,11 +40,14 @@ var HotTextUnit = exports.HotTextUnit = Montage.create(HotText, {
40 if(this._acceptableUnits.indexOf(value) !== -1) 40 if(this._acceptableUnits.indexOf(value) !== -1)
41 { 41 {
42 this._units = value; 42 this._units = value;
43 this._unitsModified = true;
43 this.needsDraw = true; 44 this.needsDraw = true;
44 45
45 this._setEventFlags("change", false); 46 this._setEventFlags("change", true);
46 this._dispatchActionEvent(); 47 this._dispatchActionEvent();
47 } 48 }
49 } else {
50 this._unitsModified = false;
48 } 51 }
49 } 52 }
50 }, 53 },
@@ -89,13 +92,13 @@ var HotTextUnit = exports.HotTextUnit = Montage.create(HotText, {
89 var match = (unitsString.replace(noSpaces, "$2")).toLowerCase(); 92 var match = (unitsString.replace(noSpaces, "$2")).toLowerCase();
90 if(match) 93 if(match)
91 { 94 {
92 Object.getPropertyDescriptor(this, "units").set.call(this, match); 95 this.units = match;
93 } 96 }
94 } 97 }
95 98
96 this._setEventFlags("change", false); 99 this._setEventFlags("change", false);
97 // Moving this call to after setting the value since value changes are dispatching events before units are set 100 // Moving this call to after setting the value since value changes are dispatching events before units are set
98 Object.getPropertyDescriptor(this, "value").set.call(this, this.inputFunction(inputString), false); 101 this.value = this.inputFunction(inputString);
99 } 102 }
100 }, 103 },
101 104