Squashed commit of the following:

commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 18 13:48:21 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:29:41 2012 -0700

    updating the picasa carousel

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:03:50 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 11 10:39:36 2012 -0700

    integrating new picasa carousel component

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 10 14:33:00 2012 -0700

    fixed the text area case issue

    Text area was renamed from TextArea to Textarea

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Mon Apr 9 22:10:45 2012 -0700

    integrating montage v0.8 into ninja.

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/node_modules/montage/ui/repetition.reel/repetition.js b/node_modules/montage/ui/repetition.reel/repetition.js
index acc03747..95790bc3 100755
--- a/node_modules/montage/ui/repetition.reel/repetition.js
+++ b/node_modules/montage/ui/repetition.reel/repetition.js
@@ -490,7 +490,9 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
     @param {Function} callback The callback method.
     */
     expandComponent: {value: function expandComponent(callback) {
-        this._setupIterationTemplate();
+        if (!this._refreshingItems) {
+            this._setupIterationTemplate();
+        }
         this._isComponentExpanded = true;
         if (callback) {
             callback();
@@ -542,10 +544,8 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
 
     // called on iteration instantiation
     templateDidLoad: {value: function() {
-        var range = document.createRange(),
-            item = this._deserializedItem,
-            children = item.element.childNodes,
-            i;
+        var item = this._deserializedItem,
+            children = item.element.childNodes;
 
         item.fragment = document.createDocumentFragment();
         while (children.length > 0) {
@@ -1134,8 +1134,8 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
     @function
     */
     setupIterationDeserialization: {value: function() {
-        //        Montage.defineProperty(this, "deserializeSelf", {value: this.deserializeIteration});
-        this.deserializeSelf = this.deserializeIteration;
+        //        Montage.defineProperty(this, "deserializeProperties", {value: this.deserializeIteration});
+        this.deserializeProperties = this.deserializeIteration;
     }},
 /**
     Description TODO
@@ -1214,13 +1214,13 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul
     @param {Property} serializer TODO
     */
     serializeIteration: {value: function(serializer) {
-        serializer.set("element", this.element);
+        serializer.setProperty("element", this.element);
         var childComponents = this.childComponents;
         for (var i = 0, l = childComponents.length; i < l; i++) {
             serializer.addObject(childComponents[i]);
         }
         // iterations are already expanded
-        serializer.set("_isComponentExpanded", true);
+        serializer.setProperty("_isComponentExpanded", true);
     }},
 /**
     Description TODO