1 files changed, 90 insertions, 98 deletions

diff --git a/node_modules/montage/ui/repetition.reel/repetition.js b/node_modules/montage/ui/repetition.reel/repetition.js
index c278e84d..ce58036a 100755
--- a/node_modules/montage/ui/repetition.reel/repetition.js
+++ b/node_modules/montage/ui/repetition.reel/repetition.js
@@ -128,8 +128,6 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
 
     didCreate: {
         value: function() {
-            var self = this;
-
             this.addPropertyChangeListener("objects", this);
             this._fakeObjects = Object.create(FakeObjects).initWithRepetition(this);
         }
@@ -184,7 +182,7 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
     handleChange: {
         enumerable: false,
         value: function(notification) {
-            if (this._isComponentExpanded) {
+            if ("objects" === notification.currentPropertyPath && this._isComponentExpanded) {
                 this._updateItems(notification.minus, notification.plus, notification.index || 0);
             }
         }
@@ -232,7 +230,6 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
   @private
 */
     _contentController: {
-        enumerable: false,
         value: null
     },
 /**
@@ -241,7 +238,6 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
         @default null
     */
     contentController: {
-        enumerable: false,
         get: function() {
             return this._contentController;
         },
@@ -253,7 +249,6 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
             if (this._contentController) {
                 Object.deleteBinding(this, "objects");
                 Object.deleteBinding(this, "selectedIndexes");
-                Object.deleteBinding(this, "selections");
             }
 
             this._contentController = value;
@@ -267,8 +262,7 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
 
                 // And bind what we need from the new contentController
                 var objectsBindingDescriptor,
-                    selectedIndexesBindingDescriptor,
-                    selectionsBindingDescriptor;
+                    selectedIndexesBindingDescriptor;
 
                 objectsBindingDescriptor = {
                     boundObject: this._contentController,
@@ -281,17 +275,12 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
                     boundObjectPropertyPath: "selectedIndexes"
                 };
 
-                selectionsBindingDescriptor = {
-                    boundObject: this._contentController,
-                    boundObjectPropertyPath: "selections"
-                };
-
                 // If we're ready for bindings...go ahead an install
                 // TODO: Look at changing this once the new serialization has been implemented
                 if (this._hasBeenDeserialized) {
                     Object.defineBinding(this, "objects", objectsBindingDescriptor);
                     Object.defineBinding(this, "selectedIndexes", selectedIndexesBindingDescriptor);
-                    Object.defineBinding(this, "selections", selectionsBindingDescriptor);
+
                 } else {
                     // otherwise we need to defer it until later; we haven't been deserialized yet
                     if (!this._controllerBindingsToInstall) {
@@ -300,13 +289,13 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
 
                     this._controllerBindingsToInstall.objects = objectsBindingDescriptor;
                     this._controllerBindingsToInstall.selectedIndexes = selectedIndexesBindingDescriptor;
-                    this._controllerBindingsToInstall.selections = selectionsBindingDescriptor;
                 }
             }
 
             //TODO otherwise if no contentController should we disable selections?
 
-        }
+        },
+        serializable: true
     },
 /**
   Description TODO
@@ -314,13 +303,11 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
 */
     _objects: {
         enumerable: false,
-        serializable: true,
         value: null
     },
 
     _mappedObjects: {
         enumerable: false,
-        serializable: true,
         value: null
     },
 /**
@@ -359,7 +346,8 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
             //if (this._isComponentExpanded) {
             //    this._refreshItems();
             //}
-        }
+        },
+        serializable: true
     },
 /**
   Description TODO
@@ -388,7 +376,8 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
             if (this._isComponentExpanded) {
                 this._refreshSelectionTracking();
             }
-        }
+        },
+        serializable: true
     },
 /**
   Description TODO
@@ -449,7 +438,8 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
             this._indexMapEnabled = value;
 
             this.refreshIndexMap();
-        }
+        },
+        serializable: true
     },
 
     _drawnIndexMap: {
@@ -646,21 +636,6 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
         }
     },
 
-    _deleteItems: {
-        value: function(minus, index) {
-            if (this._updatingItems) {
-                return;
-            }
-            this._updatingItems = true;
-
-            for (var i = 0, l = minus.length; i < l; i++) {
-                this._deleteItem(index + i);
-            }
-
-            this._updatingItems = false;
-        }
-    },
-
 /**
   Description TODO
   @private
@@ -717,9 +692,6 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
                     childComponent.needsDraw = true;
                     childComponent.loadComponentTree(function() {
                         if (++self._childLoadedCount === self._expectedChildComponentsCount) {
-//if(self.identifier == "repetition13") {
-//    debugger
-//}
                             canDrawGate.setField("iterationLoaded", true);
                             self.needsDraw = true;
                         }
@@ -734,38 +706,77 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
 */
     _deleteItem: {
         value: function(index) {
-            var deletedItem, itemIndex, removedComponents, childComponents = this.childComponents, childComponentsCount = this._iterationChildComponentsCount,
-                itemsToAppendCount = this._itemsToAppend.length;
+            var deletedItem,
+                itemIndex = index,