Skip to content

Commit 91724b4

Browse files
EisenbergEffectEisenbergEffect
committed
chore(all): prepare release 0.13.15
1 parent 014185e commit 91724b4

File tree

8 files changed

+35
-7
lines changed

8 files changed

+35
-7
lines changed

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-templating",
3-
"version": "0.13.14",
3+
"version": "0.13.15",
44
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
55
"keywords": [
66
"aurelia",

‎dist/amd/aurelia-templating.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1819,7 +1819,7 @@ define(['exports', 'core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loade
18191819
};
18201820
}
18211821

1822-
if (elementInstruction && elementInstruction.type.skipContentProcessing) {
1822+
if (elementInstruction && elementInstruction.skipContentProcessing) {
18231823
return node.nextSibling;
18241824
}
18251825

@@ -2582,6 +2582,8 @@ define(['exports', 'core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loade
25822582
var partReplacements = instruction.partReplacements = {};
25832583

25842584
if (this.processContent(compiler, resources, node, instruction) && node.hasChildNodes()) {
2585+
instruction.skipContentProcessing = false;
2586+
25852587
if (!this.usesShadowDOM) {
25862588
var fragment = document.createDocumentFragment(),
25872589
currentChild = node.firstChild,
@@ -2615,6 +2617,8 @@ define(['exports', 'core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loade
26152617
currentChild = nextSibling;
26162618
}
26172619
}
2620+
} else {
2621+
instruction.skipContentProcessing = true;
26182622
}
26192623
}
26202624

‎dist/aurelia-templating.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ export class ViewCompiler {
16751675
};
16761676
}
16771677

1678-
if(elementInstruction && elementInstruction.type.skipContentProcessing){
1678+
if(elementInstruction && elementInstruction.skipContentProcessing){
16791679
return node.nextSibling;
16801680
}
16811681

@@ -2370,6 +2370,8 @@ export class HtmlBehaviorResource {
23702370
var partReplacements = instruction.partReplacements = {};
23712371

23722372
if(this.processContent(compiler, resources, node, instruction) && node.hasChildNodes()){
2373+
instruction.skipContentProcessing = false;
2374+
23732375
if(!this.usesShadowDOM){
23742376
var fragment = document.createDocumentFragment(),
23752377
currentChild = node.firstChild,
@@ -2402,6 +2404,8 @@ export class HtmlBehaviorResource {
24022404
currentChild = nextSibling;
24032405
}
24042406
}
2407+
}else{
2408+
instruction.skipContentProcessing = true;
24052409
}
24062410
}
24072411

‎dist/commonjs/aurelia-templating.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1838,7 +1838,7 @@ var ViewCompiler = (function () {
18381838
};
18391839
}
18401840

1841-
if (elementInstruction && elementInstruction.type.skipContentProcessing) {
1841+
if (elementInstruction && elementInstruction.skipContentProcessing) {
18421842
return node.nextSibling;
18431843
}
18441844

@@ -2601,6 +2601,8 @@ var HtmlBehaviorResource = (function () {
26012601
var partReplacements = instruction.partReplacements = {};
26022602

26032603
if (this.processContent(compiler, resources, node, instruction) && node.hasChildNodes()) {
2604+
instruction.skipContentProcessing = false;
2605+
26042606
if (!this.usesShadowDOM) {
26052607
var fragment = document.createDocumentFragment(),
26062608
currentChild = node.firstChild,
@@ -2634,6 +2636,8 @@ var HtmlBehaviorResource = (function () {
26342636
currentChild = nextSibling;
26352637
}
26362638
}
2639+
} else {
2640+
instruction.skipContentProcessing = true;
26372641
}
26382642
}
26392643

‎dist/es6/aurelia-templating.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ export class ViewCompiler {
16751675
};
16761676
}
16771677

1678-
if(elementInstruction && elementInstruction.type.skipContentProcessing){
1678+
if(elementInstruction && elementInstruction.skipContentProcessing){
16791679
return node.nextSibling;
16801680
}
16811681

@@ -2370,6 +2370,8 @@ export class HtmlBehaviorResource {
23702370
var partReplacements = instruction.partReplacements = {};
23712371

23722372
if(this.processContent(compiler, resources, node, instruction) && node.hasChildNodes()){
2373+
instruction.skipContentProcessing = false;
2374+
23732375
if(!this.usesShadowDOM){
23742376
var fragment = document.createDocumentFragment(),
23752377
currentChild = node.firstChild,
@@ -2402,6 +2404,8 @@ export class HtmlBehaviorResource {
24022404
currentChild = nextSibling;
24032405
}
24042406
}
2407+
}else{
2408+
instruction.skipContentProcessing = true;
24052409
}
24062410
}
24072411

‎dist/system/aurelia-templating.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2048,7 +2048,7 @@ System.register(['core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loader'
20482048
};
20492049
}
20502050

2051-
if (elementInstruction && elementInstruction.type.skipContentProcessing) {
2051+
if (elementInstruction && elementInstruction.skipContentProcessing) {
20522052
return node.nextSibling;
20532053
}
20542054

@@ -2788,6 +2788,8 @@ System.register(['core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loader'
27882788
var partReplacements = instruction.partReplacements = {};
27892789

27902790
if (this.processContent(compiler, resources, node, instruction) && node.hasChildNodes()) {
2791+
instruction.skipContentProcessing = false;
2792+
27912793
if (!this.usesShadowDOM) {
27922794
var fragment = document.createDocumentFragment(),
27932795
currentChild = node.firstChild,
@@ -2821,6 +2823,8 @@ System.register(['core-js', 'aurelia-metadata', 'aurelia-path', 'aurelia-loader'
28212823
currentChild = nextSibling;
28222824
}
28232825
}
2826+
} else {
2827+
instruction.skipContentProcessing = true;
28242828
}
28252829
}
28262830

‎doc/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
### 0.13.15 (2015-07-30)
2+
3+
4+
#### Bug Fixes
5+
6+
* **view-compiler:** properly handle content process skip ([014185ed](http://github.com/aurelia/templating/commit/014185ed849c71d539fa56f629aa58baf086f6bb))
7+
8+
19
### 0.13.14 (2015-07-30)
210

311

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-templating",
3-
"version": "0.13.14",
3+
"version": "0.13.15",
44
"description": "An extensible HTML templating engine supporting databinding, custom elements, attached behaviors and more.",
55
"keywords": [
66
"aurelia",

0 commit comments

Comments
 (0)