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/select-input.reel | |
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/select-input.reel')
-rw-r--r-- | node_modules/montage/ui/select-input.reel/select-input.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/node_modules/montage/ui/select-input.reel/select-input.js b/node_modules/montage/ui/select-input.reel/select-input.js index 98902cfb..220c3814 100644 --- a/node_modules/montage/ui/select-input.reel/select-input.js +++ b/node_modules/montage/ui/select-input.reel/select-input.js | |||
@@ -21,7 +21,10 @@ var SelectInput = exports.SelectInput = Montage.create(NativeControl, { | |||
21 | _selectedIndexes: { | 21 | _selectedIndexes: { |
22 | set: function(value) { | 22 | set: function(value) { |
23 | this.__selectedIndexes = value; | 23 | this.__selectedIndexes = value; |
24 | this.needsDraw = this._synching || !this._fromInput; | 24 | if(this.needsDraw === false) { |
25 | this.needsDraw = this._synching || !this._fromInput; | ||
26 | } | ||
27 | |||
25 | }, | 28 | }, |
26 | get: function() { | 29 | get: function() { |
27 | return this.__selectedIndexes; | 30 | return this.__selectedIndexes; |
@@ -218,7 +221,7 @@ var SelectInput = exports.SelectInput = Montage.create(NativeControl, { | |||
218 | } | 221 | } |
219 | this._fromInput = true; | 222 | this._fromInput = true; |
220 | this.contentController.selectedIndexes = selectedIndexes; | 223 | this.contentController.selectedIndexes = selectedIndexes; |
221 | 224 | ||
222 | } | 225 | } |
223 | } | 226 | } |
224 | 227 | ||