diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/select-input.reel/select-input.js | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/ui/select-input.reel/select-input.js')
-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 | ||