Replace placeholders backwards to simplify.

Polymer · Jul 16, 2015 · 5eda235 · 5eda235
1 parent 3e02bfd
commit 5eda235
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/lib/template/dom-repeat.html b/src/lib/template/dom-repeat.html
@@ -374,11 +374,11 @@
       for (var i=0; i<keys.length; i++) {
         var key = keys[i];
         var inst = this._instances[i];
-        if (!inst) {
-          this._instances.push(this._insertRow(i, key));
-        } else {
+        if (inst) {
           inst.__setProperty('__key__', key, true);
           inst.__setProperty(this.as, c.getItem(key), true);
+        } else {
+          this._instances.push(this._insertRow(i, key));
         }
       }
       // Remove any extra instances from previous state
@@ -505,21 +505,21 @@
         this._instances.splice(s.index, s.removed.length);
         // Insert placeholders for new rows
         for (var i=0; i<s.added.length; i++) {
-          var beforeRow = this._instances[s.index + i];
           var inst = {
             isPlaceholder: true,
-            key: s.added[i],
-            _children: [beforeRow ? beforeRow._children[0] : this]
+            key: s.added[i]
           };
           this._instances.splice(s.index + i, 0, inst);
         }
       }, this);
       // Replace placeholders with actual instances (from pool or newly created)
-      this._instances.forEach(function(inst, idx) {
+      // Iterate backwards to ensure insertBefore refrence is never a placeholder
+      for (var i=this._instances.length-1; i>=0; i--) {
+        var inst = this._instances[i];
         if (inst.isPlaceholder) {
-          this._instances[idx] = this._insertRow(idx, inst.key, pool);
+          this._instances[i] = this._insertRow(i, inst.key, pool, true);
         }
-      }, this);
+      }
     },
 
     _detachRow: function(idx) {
@@ -534,15 +534,15 @@
       return inst;
     },
 
-    _insertRow: function(idx, key, pool) {
+    _insertRow: function(idx, key, pool, replace) {
       var inst;
       if (inst = pool && pool.pop()) {
         inst.__setProperty(this.as, this.collection.getItem(key), true);
         inst.__setProperty('__key__', key, true);
       } else {
         inst = this._generateRow(idx, key);
       }
-      var beforeRow = this._instances[idx];
+      var beforeRow = this._instances[replace ? idx + 1 : idx];
       var beforeNode = beforeRow ? beforeRow._children[0] : this;
       var parentNode = Polymer.dom(this).parentNode;
       Polymer.dom(parentNode).insertBefore(inst.root, beforeNode);