chore(all): prepare release 0.13.15

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

Hide file tree

Showing 8 changed files with 35 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-templating",
-  "version": "0.13.14",
+  "version": "0.13.15",
   "description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/aurelia-templating.js b/dist/amd/aurelia-templating.js
@@ -1819,7 +1819,7 @@ define(['exports', 'core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loade
           };
         }
 
-        if (elementInstruction && elementInstruction.type.skipContentProcessing) {
+        if (elementInstruction && elementInstruction.skipContentProcessing) {
           return node.nextSibling;
         }
 
@@ -2582,6 +2582,8 @@ define(['exports', 'core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loade
         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,
@@ -2615,6 +2617,8 @@ define(['exports', 'core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loade
               currentChild = nextSibling;
             }
           }
+        } else {
+          instruction.skipContentProcessing = true;
         }
       }
 

diff --git a/dist/aurelia-templating.js b/dist/aurelia-templating.js
@@ -1675,7 +1675,7 @@ export class ViewCompiler {
         };
       }
 
-      if(elementInstruction && elementInstruction.type.skipContentProcessing){
+      if(elementInstruction && elementInstruction.skipContentProcessing){
         return node.nextSibling;
       }
 
@@ -2370,6 +2370,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,
@@ -2402,6 +2404,8 @@ export class HtmlBehaviorResource {
             currentChild = nextSibling;
           }
         }
+      }else{
+        instruction.skipContentProcessing = true;
       }
     }
 

diff --git a/dist/commonjs/aurelia-templating.js b/dist/commonjs/aurelia-templating.js
@@ -1838,7 +1838,7 @@ var ViewCompiler = (function () {
         };
       }
 
-      if (elementInstruction && elementInstruction.type.skipContentProcessing) {
+      if (elementInstruction && elementInstruction.skipContentProcessing) {
         return node.nextSibling;
       }
 
@@ -2601,6 +2601,8 @@ var HtmlBehaviorResource = (function () {
       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,
@@ -2634,6 +2636,8 @@ var HtmlBehaviorResource = (function () {
             currentChild = nextSibling;
           }
         }
+      } else {
+        instruction.skipContentProcessing = true;
       }
     }
 

diff --git a/dist/es6/aurelia-templating.js b/dist/es6/aurelia-templating.js
@@ -1675,7 +1675,7 @@ export class ViewCompiler {
         };
       }
 
-      if(elementInstruction && elementInstruction.type.skipContentProcessing){
+      if(elementInstruction && elementInstruction.skipContentProcessing){
         return node.nextSibling;
       }
 
@@ -2370,6 +2370,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,
@@ -2402,6 +2404,8 @@ export class HtmlBehaviorResource {
             currentChild = nextSibling;
           }
         }
+      }else{
+        instruction.skipContentProcessing = true;
       }
     }
 

diff --git a/dist/system/aurelia-templating.js b/dist/system/aurelia-templating.js
@@ -2048,7 +2048,7 @@ System.register(['core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loader'
               };
             }
 
-            if (elementInstruction && elementInstruction.type.skipContentProcessing) {
+            if (elementInstruction && elementInstruction.skipContentProcessing) {
               return node.nextSibling;
             }
 
@@ -2788,6 +2788,8 @@ System.register(['core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loader'
             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,
@@ -2821,6 +2823,8 @@ System.register(['core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loader'
                   currentChild = nextSibling;
                 }
               }
+            } else {
+              instruction.skipContentProcessing = true;
             }
           }
 

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 0.13.15 (2015-07-30)
+
+
+#### Bug Fixes
+
+* **view-compiler:** properly handle content process skip ([014185ed](http://github.com/aurelia/templating/commit/014185ed849c71d539fa56f629aa58baf086f6bb))
+
+
 ### 0.13.14 (2015-07-30)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-templating",
-  "version": "0.13.14",
+  "version": "0.13.15",
   "description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
   "keywords": [
     "aurelia",