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/controller | |
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/controller')
-rwxr-xr-x | node_modules/montage/ui/controller/array-controller.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/node_modules/montage/ui/controller/array-controller.js b/node_modules/montage/ui/controller/array-controller.js index 868ae5de..f355efc1 100755 --- a/node_modules/montage/ui/controller/array-controller.js +++ b/node_modules/montage/ui/controller/array-controller.js | |||
@@ -519,9 +519,11 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController, | |||
519 | return null; | 519 | return null; |
520 | } | 520 | } |
521 | 521 | ||
522 | this._selectedObjects = this.content.filter(function(value, i) { | 522 | if(this.content) { |
523 | return this._selectedContentIndexes.indexOf(i) >= 0; | 523 | this._selectedObjects = this.content.filter(function(value, i) { |
524 | }, this); | 524 | return this._selectedContentIndexes.indexOf(i) >= 0; |
525 | }, this); | ||
526 | } | ||
525 | 527 | ||
526 | return this._selectedObjects; | 528 | return this._selectedObjects; |
527 | }, | 529 | }, |