1 files changed, 125 insertions, 122 deletions

diff --git a/node_modules/montage/ui/controller/array-controller.js b/node_modules/montage/ui/controller/array-controller.js
index ec236b39..1768398f 100644
--- a/node_modules/montage/ui/controller/array-controller.js
+++ b/node_modules/montage/ui/controller/array-controller.js
@@ -21,13 +21,44 @@ var Montage = require("montage").Montage,
 */
 var ArrayController = exports.ArrayController = Montage.create(ObjectController, /** @lends module:montage/ui/controller/array-controller.ArrayController# */ {
 
+    didCreate: {
+        value: function() {
+            var self = this;
+
+            // TODO optimize this, try to use dependentProperties perhaps
+
+            this.addPropertyChangeListener("selections", function() {
+
+                var newSelectedIndexes = [];
+                self._selections.forEach(function(item, i) {
+                    if (item) {
+                        newSelectedIndexes.push(i);
+                    }
+                });
+
+                // TODO this triggers an infinite loop
+                self.selectedIndexes = newSelectedIndexes;
+            });
+
+            this.addPropertyChangeListener("content", function() {
+                // TODO for right now assume that any content change invalidates the selection completely;
+                // we'll need to address this of course
+                self.selectedObjects = null;
+
+                if (self.automaticallyOrganizeObjects) {
+                    self.organizeObjects();
+                }
+            });
+        }
+    },
+
     /**
      @private
      */
     _content: {
-        enumerable: false,
         value: null
     },
+
     /**
         The content managed by the ArrayController.
         @type {Function}
@@ -44,11 +75,8 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController,
             }
             this._content = value;
 
-            //TODO for right now assume that any content change invalidates the selection completely; we'll need to address this of course
-            this.selectedObjects = null;
-            this.organizeObjects();
-            this._initSelections();
-        }
+        },
+        serializable: true
     },
 
     /**
@@ -68,15 +96,16 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController,
      })
      */
     delegate: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     /**
      @private
      */
     _organizedObjects: {
-        enumerable: false,
-        value: null
+        distinct: true,
+        value: []
     },
 
     /**
@@ -85,33 +114,25 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController,
      @default null
      */
     organizedObjects: {
-        enumerable: false,
         get: function() {
-
-            if (this._organizedObjects) {
-                return this._organizedObjects;
-            }
-
-            this.organizeObjects();
-
             return this._organizedObjects;
         }
     },
 
     /**
-     Specifies whether the ArrayCollection's content is automatically organized (false, by default).
+     Specifies whether the ArrayCollection's content is automatically organized.
      @type {Property}
-     @default {Boolean} false
+     @default {Boolean} true
      */
     automaticallyOrganizeObjects: {
-        value: false
+        value: true,
+        serializable: true
     },
 
     /**
      @private
      */
     _sortFunction: {
-        enumerable: false,
         value: null
     },
 
@@ -136,14 +157,14 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController,
             if (this.automaticallyOrganizeObjects) {
                 this.organizeObjects();
             }
-        }
+        },
+        serializable: true
     },
 
     /**
      @private
      */
     _filterFunction: {
-        enumerable: false,
         value: null
     },
 
@@ -168,14 +189,14 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController,
             if (this.automaticallyOrganizeObjects) {
                 this.organizeObjects();
             }
-        }
+        },
+        serializable: true
     },
 
     /**
         @private
     */
     _startIndex: {
-        enumerable: false,
         value: null
     },
 
@@ -186,7 +207,7 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController,
         @version 1.0
     */
     startIndex: {
-        enumerable: false,
+        serializable: true,
         get: function() {
             return this._startIndex;
         },
@@ -219,7 +240,7 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController,
         @version 1.0
     */
     endIndex: {
-        enumerable: false,
+        serializable: true,
         get: function() {
             return this._endIndex;
         },
@@ -241,24 +262,21 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController,
         @private
     */
     _organizedObjectsIndexes: {
-        value: null,
-        enumerable: false
+        value: null
     },
 
     /*
         @private
     */