diff options
author | Valerio Virgillito | 2012-03-08 13:56:09 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-03-08 13:56:09 -0800 |
commit | 22a66cb6e243a3f1c867b62e3942fd2e828019d9 (patch) | |
tree | 4b2f8bf0d8306964f35435dac3d1f6592b3dee19 /node_modules/montage/ui/text-input.js | |
parent | cef07085443b7c31e878daaad083b7408c57e104 (diff) | |
download | ninja-22a66cb6e243a3f1c867b62e3942fd2e828019d9.tar.gz |
integrating v0.7 montage into ninja
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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 | /** |