From aca60ce8cb2af821005fa850ccf468ff4a91c8b3 Mon Sep 17 00:00:00 2001 From: Rob Eisenberg Date: Fri, 27 Mar 2015 09:50:03 -0400 Subject: [PATCH] chore(all): prepare release 0.9.2 --- bower.json | 2 +- dist/amd/compose.js | 2 +- dist/commonjs/compose.js | 2 +- dist/es6/compose.js | 2 +- dist/system/compose.js | 2 +- doc/CHANGELOG.md | 8 ++++++++ package.json | 2 +- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bower.json b/bower.json index be1649b..5605a7e 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "aurelia-templating-resources", - "version": "0.9.1", + "version": "0.9.2", "description": "A standard set of behaviors, converters and other resources for use with the Aurelia templating library.", "keywords": [ "aurelia", diff --git a/dist/amd/compose.js b/dist/amd/compose.js index 56604b8..a7b75d7 100644 --- a/dist/amd/compose.js +++ b/dist/amd/compose.js @@ -84,7 +84,7 @@ define(["exports", "aurelia-dependency-injection", "aurelia-templating"], functi currentBehavior: composer.currentBehavior })).then(function (next) { composer.currentBehavior = next; - composer.currentViewModel = next.executionContext; + composer.currentViewModel = next ? next.executionContext : null; }); } Object.defineProperty(exports, "__esModule", { diff --git a/dist/commonjs/compose.js b/dist/commonjs/compose.js index 2b632fe..16cfd8a 100644 --- a/dist/commonjs/compose.js +++ b/dist/commonjs/compose.js @@ -86,7 +86,7 @@ function processInstruction(composer, instruction) { currentBehavior: composer.currentBehavior })).then(function (next) { composer.currentBehavior = next; - composer.currentViewModel = next.executionContext; + composer.currentViewModel = next ? next.executionContext : null; }); } Object.defineProperty(exports, "__esModule", { diff --git a/dist/es6/compose.js b/dist/es6/compose.js index acce2b5..6b75743 100644 --- a/dist/es6/compose.js +++ b/dist/es6/compose.js @@ -50,6 +50,6 @@ function processInstruction(composer, instruction){ currentBehavior:composer.currentBehavior })).then(next => { composer.currentBehavior = next; - composer.currentViewModel = next.executionContext; + composer.currentViewModel = next ? next.executionContext : null; }); } diff --git a/dist/system/compose.js b/dist/system/compose.js index fafc222..4c5579d 100644 --- a/dist/system/compose.js +++ b/dist/system/compose.js @@ -10,7 +10,7 @@ System.register(["aurelia-dependency-injection", "aurelia-templating"], function currentBehavior: composer.currentBehavior })).then(function (next) { composer.currentBehavior = next; - composer.currentViewModel = next.executionContext; + composer.currentViewModel = next ? next.executionContext : null; }); } return { diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index abc75bd..ab4ecd0 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,11 @@ +### 0.9.2 (2015-03-27) + + +#### Bug Fixes + +* **compose:** null/undefined components should not cause error ([14d26539](http://github.com/aurelia/templating-resources/commit/14d2653986a119ac6e27c792b11c2d75bf811a0f), closes [#31](http://github.com/aurelia/templating-resources/issues/31)) + + ### 0.9.1 (2015-03-25) diff --git a/package.json b/package.json index 14aeda2..01b02d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aurelia-templating-resources", - "version": "0.9.1", + "version": "0.9.2", "description": "A standard set of behaviors, converters and other resources for use with the Aurelia templating library.", "keywords": [ "aurelia",