diff options
author | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
commit | 46b2e561fa6ca054cad58e4c372a598bbb7ee2c9 (patch) | |
tree | 38d1c8666098a10078834c1eaac3d455135bee12 /node_modules/montage/ui/text-input.js | |
parent | 7b4b068cadc0af8ec7e930e1c2b429e945f96984 (diff) | |
parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
download | ninja-46b2e561fa6ca054cad58e4c372a598bbb7ee2c9.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage/ui/text-input.js')
-rw-r--r-- | node_modules/montage/ui/text-input.js | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/node_modules/montage/ui/text-input.js b/node_modules/montage/ui/text-input.js index 403c342d..cdd20c78 100644 --- a/node_modules/montage/ui/text-input.js +++ b/node_modules/montage/ui/text-input.js | |||
@@ -184,25 +184,21 @@ var TextInput = exports.TextInput = Montage.create(NativeControl, { | |||
184 | draw: { | 184 | draw: { |
185 | enumerable: false, | 185 | enumerable: false, |
186 | value: function() { | 186 | value: function() { |
187 | Object.getPrototypeOf(TextInput).draw.call(this); | ||
187 | 188 | ||
188 | var t = this.element; | 189 | var el = this.element; |
189 | 190 | ||
190 | if (!this._valueSyncedWithInputField) { | 191 | if (!this._valueSyncedWithInputField) { |
191 | this._setElementValue(this.converter ? this.converter.convert(this._value) : this._value); | 192 | this._setElementValue(this.converter ? this.converter.convert(this._value) : this._value); |
192 | } | 193 | } |
193 | 194 | ||
194 | |||
195 | if (this.error) { | 195 | if (this.error) { |
196 | t.classList.add('montage-text-invalid'); | 196 | el.classList.add('montage-text-invalid'); |
197 | t.title = this.error.message || ''; | 197 | el.title = this.error.message || ''; |
198 | } else { | 198 | } else { |
199 | t.classList.remove("montage-text-invalid"); | 199 | el.classList.remove("montage-text-invalid"); |
200 | t.title = ''; | 200 | el.title = ''; |
201 | } | 201 | } |
202 | |||
203 | var fn = Object.getPrototypeOf(TextInput).draw; | ||
204 | fn.call(this); | ||
205 | |||
206 | } | 202 | } |
207 | }, | 203 | }, |
208 | /** | 204 | /** |