1 files changed, 142 insertions, 101 deletions

diff --git a/node_modules/montage/ui/repetition.reel/repetition.js b/node_modules/montage/ui/repetition.reel/repetition.js
index a50c4823..3405a3d7 100755
--- a/node_modules/montage/ui/repetition.reel/repetition.js
+++ b/node_modules/montage/ui/repetition.reel/repetition.js
@@ -33,15 +33,6 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
         value: false,
         enumerable: false
     },
-/**
-        Description TODO
-        @type {Property}
-        @default {Boolean} false
-    */
-    USE_FLATTENING: {
-        enumerable: false,
-        value: false
-    },
 
 /**
   Description TODO
@@ -94,6 +85,7 @@ 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;
@@ -107,7 +99,8 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
 
                 // And bind what we need from the new contentController
                 var objectsBindingDescriptor,
-                    selectedIndexesBindingDescriptor;
+                    selectedIndexesBindingDescriptor,
+                    selectionsBindingDescriptor;
 
                 objectsBindingDescriptor = {
                     boundObject: this._contentController,
@@ -120,11 +113,17 @@ 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) {
@@ -133,6 +132,7 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
 
                     this._controllerBindingsToInstall.objects = objectsBindingDescriptor;
                     this._controllerBindingsToInstall.selectedIndexes = selectedIndexesBindingDescriptor;
+                    this._controllerBindingsToInstall.selections = selectionsBindingDescriptor;
                 }
             }
 
@@ -161,7 +161,7 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
         },
         set: function(value) {
             if (logger.isDebug) {
-                logger.debug(this, " set objects:", value.length, value, "same objects?", value === this._objects);
+                logger.debug(this, " set objects:", (value ? value.length : null), value, "same objects?", value === this._objects);
             }
             this._objects = value;
 
@@ -173,6 +173,7 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
             if (this._isComponentExpanded) {
                 this._refreshItems();
             }
+
         },
         modify: function(modificationType, newValue, oldValue) {
             this.selectedIndexes = null;
@@ -223,7 +224,7 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
   Description TODO
   @private
 */
-    _childComponentsCount: {
+    _iterationChildComponentsCount: {
         enumerable: false,
         serializable: true,
         value: null
@@ -279,14 +280,6 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
   Description TODO
   @private
 */
-    _iterationFragment: {
-        enumerable: false,
-        value: null
-    },
-/**
-  Description TODO
-  @private
-*/
     _refreshingItems: {
         value: false
     },
@@ -322,7 +315,7 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
             // or well I'm trying a flag right
             if (neededItemCount > 0) {
                 // _addItem might be completly synchrounous since we cache both template and deserializer so we need to set this before adding any item otherwise it will trigger a draw after every iteration template instantiation.
-                this._expectedChildComponentsCount += (this._childComponentsCount||1) * neededItemCount;
+                this._expectedChildComponentsCount += (this._iterationChildComponentsCount||1) * neededItemCount;
                 this.canDrawGate.setField("iterationLoaded", false);
                 // Need to add more items
                 for (i = 0; i < neededItemCount; i++) {
@@ -363,10 +356,8 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
         // for clarity sake
         this._itemsToAppend.push(this._currentItem);
         index = items.length + this._itemsToAppend.length - 1;
-        
         self._canDraw = false;
-        componentsCount = this._childComponentsCount;
-
+        componentsCount = this._iterationChildComponentsCount;
         this._iterationTemplate.instantiateWithComponent(this, function() {
             if (componentsCount === 0) {
                 if (++self._childLoadedCount === self._expectedChildComponentsCount) {
@@ -374,11 +365,10 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
                 }
             } else {
                 childComponents = self.childComponents;
-                componentStartIndex = index * self._childComponentsCount;
+                componentStartIndex = index * self._iterationChildComponentsCount;
                 componentEndIndex = componentStartIndex + componentsCount;
                 for (var i = componentStartIndex; i < componentEndIndex; i++) {
                     childComponent = childComponents[i];
-                    childComponent.element.id = childComponent.element.id + "-" + index;
                     childComponent.needsDraw = true;
                     childComponent.loadComponentTree(function() {
                         if (++self._childLoadedCount === self._expectedChildComponentsCount) {
@@ -395,13 +385,14 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
 */
     _deleteItem: {value: function() {
 
-        var deletedItem, itemIndex, removedComponents, childComponents = this.childComponents, childComponentsCount = this._childComponentsCount,
+        var deletedItem, itemIndex, removedComponents, childComponents = this.childComponents, childComponentsCount = this._iterationChildComponentsCount,
             itemsToAppendCount = this._itemsToAppend.length;
         if (itemsToAppendCount > 0) {
             // We caught the need to remove these items before they got inserted
             // just don't bother appending them
             deletedItem = this._itemsToAppend.pop();
-            this._deletedItems.push(deletedItem);
+            // TODO: make _deletedItems usable in _addItem
+            //this._deletedItems.push(deletedItem);
             if (--itemsToAppendCount <= this._nextDeserializedItemIx) {
                 this._nextDeserializedItemIx = itemsToAppendCount;
             }
@@ -416,7 +407,7 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
             this._childLoadedCount -= childComponentsCount;
             this._expectedChildComponentsCount -= childComponentsCount;
             for (var i = 0, l = removedComponents.length; i < l; i++) {
-                this.cleanupDeletedComponentTree(removedComponents[i]);
+                removedComponents[i].cleanupDeletedComponentTree();
             }
         } else {
             this._childLoadedCount--;