fix(html-behavior): remove double compile of template parts

aurelia · Aug 3, 2015 · 49a5ad7 · 49a5ad7
1 parent e807868
commit 49a5ad7
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 24 deletions.
diff --git a/src/dom.js b/src/dom.js
@@ -1,4 +1,5 @@
 let needsTemplateFixup = !('content' in document.createElement('template'));
+let shadowPoly = window.ShadowDOMPolyfill || null;
 
 export let DOMBoundary = 'aurelia-dom-boundary';
 
@@ -15,3 +16,28 @@ export function createTemplateFromMarkup(markup){
 
   return temp;
 }
+
+export function replaceNode(newNode, node, parentNode){
+  if(node.parentNode){
+    node.parentNode.replaceChild(newNode, node);
+  }else if(shadowPoly){ //HACK: IE template element and shadow dom polyfills not quite right...
+    shadowPoly.unwrap(parentNode).replaceChild(
+      shadowPoly.unwrap(newNode),
+      shadowPoly.unwrap(node)
+      );
+  }else{ //HACK: same as above
+    parentNode.replaceChild(newNode, node);
+  }
+}
+
+export function removeNode(node, parentNode) {
+  if(node.parentNode){
+    node.parentNode.removeChild(node);
+  }else if(shadowPoly){ //HACK: IE template element and shadow dom polyfills not quite right...
+    shadowPoly.unwrap(parentNode).removeChild(
+      shadowPoly.unwrap(node)
+      );
+  }else{ //HACK: same as above
+    parentNode.removeChild(node);
+  }
+}
diff --git a/src/html-behavior.js b/src/html-behavior.js
@@ -10,7 +10,7 @@ import {hyphenate} from './util';
 import {BindableProperty} from './bindable-property';
 import {BehaviorInstance} from './behavior-instance';
 import {ResourceRegistry} from './resource-registry';
-import {DOMBoundary} from './dom';
+import {DOMBoundary, replaceNode, removeNode} from './dom';
 
 var defaultInstruction = { suppressBind:false },
     contentSelectorFactoryOptions = { suppressBind:true, enhance:false },
@@ -162,18 +162,7 @@ export class HtmlBehaviorResource {
             part = node.getAttribute('part');
 
         node.removeAttribute(instruction.originalAttrName);
-
-        if(node.parentNode){
-          node.parentNode.replaceChild(template, node);
-        }else if(window.ShadowDOMPolyfill){ //HACK: IE template element and shadow dom polyfills not quite right...
-          ShadowDOMPolyfill.unwrap(parentNode).replaceChild(
-            ShadowDOMPolyfill.unwrap(template),
-            ShadowDOMPolyfill.unwrap(node)
-            );
-        }else{ //HACK: same as above
-          parentNode.replaceChild(template, node);
-        }
-
+        replaceNode(template, node, parentNode);
         fragment.appendChild(node);
         instruction.viewFactory = compiler.compile(fragment, resources);
 
@@ -188,39 +177,42 @@ export class HtmlBehaviorResource {
       var partReplacements = instruction.partReplacements = {};
 
       if(this.processContent(compiler, resources, node, instruction) && node.hasChildNodes()){
-        instruction.skipContentProcessing = false;
-
-        if(!this.usesShadowDOM){
-          var fragment = document.createDocumentFragment(),
-              currentChild = node.firstChild,
-              nextSibling;
+        if(this.usesShadowDOM){
+          var currentChild = node.firstChild,
+              nextSibling, toReplace;
 
           while (currentChild) {
             nextSibling = currentChild.nextSibling;
 
             if(currentChild.tagName === 'TEMPLATE' && (toReplace = currentChild.getAttribute('replace-part'))){
               partReplacements[toReplace] = compiler.compile(currentChild, resources);
-            }else{
-              fragment.appendChild(currentChild);
+              removeNode(currentChild, parentNode);
             }
 
             currentChild = nextSibling;
           }
 
-          instruction.contentFactory = compiler.compile(fragment, resources);
+          instruction.skipContentProcessing = false;
         }else{
-          var currentChild = node.firstChild,
-              nextSibling, toReplace;
+          var fragment = document.createDocumentFragment(),
+              currentChild = node.firstChild,
+              nextSibling;
 
           while (currentChild) {
             nextSibling = currentChild.nextSibling;
 
             if(currentChild.tagName === 'TEMPLATE' && (toReplace = currentChild.getAttribute('replace-part'))){
               partReplacements[toReplace] = compiler.compile(currentChild, resources);
+              removeNode(currentChild, parentNode);
+            }else{
+              fragment.appendChild(currentChild);
             }
 
             currentChild = nextSibling;
           }
+
+          instruction.contentFactory = compiler.compile(fragment, resources);
+          instruction.skipContentProcessing = true;
         }
       }else{
         instruction.skipContentProcessing = true;