Merge pull request #2696 from Polymer/2685-kschaaf-detached-domif

Ensure parent node exists when stamping. Fixes #2685.
Polymer · Nov 6, 2015 · 07d39a1 · 07d39a1
2 parents 951031f + fa96ff3
commit 07d39a1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/src/lib/template/dom-if.html b/src/lib/template/dom-if.html
@@ -116,12 +116,16 @@
 
     _ensureInstance: function() {
       if (!this._instance) {
-        // TODO(sorvell): pickup stamping logic from x-repeat
-        this._instance = this.stamp();
-        var root = this._instance.root;
-        // TODO(sorvell): this incantation needs to be simpler.
-        var parent = Polymer.dom(Polymer.dom(this).parentNode);
-        parent.insertBefore(root, this);
+        var parentNode = Polymer.dom(this).parentNode;
+        // Guard against element being detached while render was queued
+        if (parentNode) {
+          var parent = Polymer.dom(parentNode);
+          // TODO(sorvell): pickup stamping logic from x-repeat
+          this._instance = this.stamp();
+          var root = this._instance.root;
+          // TODO(sorvell): this incantation needs to be simpler.
+          parent.insertBefore(root, this);
+        }
       }
     },
 

diff --git a/test/unit/dom-if.html b/test/unit/dom-if.html
@@ -56,6 +56,10 @@
     </template>
   </div>
 
+  <template is="dom-if" id="simple">
+    <div></div>
+  </template>
+
   <script>
 
     suite('nested pre-configured dom-if', function() {
@@ -493,6 +497,22 @@
 
     });
 
+    suite('queueing race conditions', function() {
+
+      test('domif=true, attach, detach', function(done) {
+        var domif = document.querySelector('#simple');
+        domif.if = true;
+        document.body.appendChild(domif);
+        document.body.removeChild(domif);
+        setTimeout(function() {
+          document.body.appendChild(domif);
+          done();
+        });
+      });
+
+    });
+
+
   </script>
 
 </body>