diff options
author | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-18 13:48:51 -0700 |
commit | 2e04af953463643791f6362bd8ef4c6ba190abfa (patch) | |
tree | d07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/ui/native-control.js | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz |
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 18 13:48:21 2012 -0700
Merge branch 'refs/heads/master' into integration
commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:29:41 2012 -0700
updating the picasa carousel
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 17 15:03:50 2012 -0700
Merge branch 'refs/heads/master' into integration
commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date: Wed Apr 11 10:39:36 2012 -0700
integrating new picasa carousel component
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date: Tue Apr 10 14:33:00 2012 -0700
fixed the text area case issue
Text area was renamed from TextArea to Textarea
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date: Mon Apr 9 22:10:45 2012 -0700
integrating montage v0.8 into ninja.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/native-control.js')
-rw-r--r-- | node_modules/montage/ui/native-control.js | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/node_modules/montage/ui/native-control.js b/node_modules/montage/ui/native-control.js index 907711e2..7cf65bd5 100644 --- a/node_modules/montage/ui/native-control.js +++ b/node_modules/montage/ui/native-control.js | |||
@@ -28,10 +28,11 @@ var NativeControl = exports.NativeControl = Montage.create(Component, { | |||
28 | return this._element; | 28 | return this._element; |
29 | }, | 29 | }, |
30 | set: function(value) { | 30 | set: function(value) { |
31 | //var component = Object.getPrototypeOf(NativeControl); | ||
32 | // call super set | ||
33 | Object.getPropertyDescriptor(Component, "element").set.call(this, value); | 31 | Object.getPropertyDescriptor(Component, "element").set.call(this, value); |
34 | this.didSetElement(); | 32 | |
33 | if (value) { | ||
34 | this.didSetElement(); | ||
35 | } | ||
35 | } | 36 | } |
36 | }, | 37 | }, |
37 | 38 | ||
@@ -188,7 +189,7 @@ var NativeControl = exports.NativeControl = Montage.create(Component, { | |||
188 | this["_"+attributeName] = this._elementAttributeDescriptors[attributeName].value; | 189 | this["_"+attributeName] = this._elementAttributeDescriptors[attributeName].value; |
189 | } | 190 | } |
190 | } | 191 | } |
191 | 192 | this.needsDraw = true; | |
192 | } | 193 | } |
193 | }, | 194 | }, |
194 | 195 | ||
@@ -221,12 +222,9 @@ var NativeControl = exports.NativeControl = Montage.create(Component, { | |||
221 | 222 | ||
222 | } | 223 | } |
223 | } | 224 | } |
224 | 225 | delete this._elementAttributeValues[attributeName]; | |
225 | } | 226 | } |
226 | } | 227 | } |
227 | // the values have been flushed to the DOM. | ||
228 | this._elementAttributeValues = {}; | ||
229 | |||
230 | } | 228 | } |
231 | } | 229 | } |
232 | }); | 230 | }); |