fix(view-compiler): properly handle content process skip

aurelia · Jul 30, 2015 · 014185e · 014185e
1 parent a453dd9
commit 014185e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/html-behavior.js b/src/html-behavior.js
@@ -188,6 +188,8 @@ 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,
@@ -220,6 +222,8 @@ export class HtmlBehaviorResource {
             currentChild = nextSibling;
           }
         }
+      }else{
+        instruction.skipContentProcessing = true;
       }
     }
 

diff --git a/src/view-compiler.js b/src/view-compiler.js
@@ -391,7 +391,7 @@ export class ViewCompiler {
         };
       }
 
-      if(elementInstruction && elementInstruction.type.skipContentProcessing){
+      if(elementInstruction && elementInstruction.skipContentProcessing){
         return node.nextSibling;
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -391,7 +391,7 @@ export class ViewCompiler { @@
             };
           }
-          if(elementInstruction && elementInstruction.type.skipContentProcessing){
+          if(elementInstruction && elementInstruction.skipContentProcessing){
             return node.nextSibling;
           }
@@ Expand Down @@