chore(all): prepare release 1.3.0

aurelia · Apr 5, 2017 · ac6bf75 · ac6bf75
1 parent fbc3c2c
commit ac6bf75
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-router",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "A powerful client-side router.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/aurelia-router.js b/dist/amd/aurelia-router.js
@@ -264,13 +264,14 @@ define(['exports', 'aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depen
     };
 
     NavigationInstruction.prototype.addViewPortInstruction = function addViewPortInstruction(viewPortName, strategy, moduleId, component) {
+      var config = Object.assign({}, this.lifecycleArgs[1], { currentViewPort: viewPortName });
       var viewportInstruction = this.viewPortInstructions[viewPortName] = {
         name: viewPortName,
         strategy: strategy,
         moduleId: moduleId,
         component: component,
         childRouter: component.childRouter,
-        lifecycleArgs: this.lifecycleArgs.slice()
+        lifecycleArgs: [].concat(this.lifecycleArgs[0], config, this.lifecycleArgs[2])
       };
 
       return viewportInstruction;

diff --git a/dist/aurelia-router.js b/dist/aurelia-router.js
@@ -309,13 +309,14 @@ export class NavigationInstruction {
   * Adds a viewPort instruction.
   */
   addViewPortInstruction(viewPortName: string, strategy: string, moduleId: string, component: any): any {
+    const config = Object.assign({}, this.lifecycleArgs[1], { currentViewPort: viewPortName });
     let viewportInstruction = this.viewPortInstructions[viewPortName] = {
       name: viewPortName,
       strategy: strategy,
       moduleId: moduleId,
       component: component,
       childRouter: component.childRouter,
-      lifecycleArgs: this.lifecycleArgs.slice()
+      lifecycleArgs: [].concat(this.lifecycleArgs[0], config, this.lifecycleArgs[2])
     };
 
     return viewportInstruction;

diff --git a/dist/commonjs/aurelia-router.js b/dist/commonjs/aurelia-router.js
@@ -219,13 +219,14 @@ var NavigationInstruction = exports.NavigationInstruction = function () {
   };
 
   NavigationInstruction.prototype.addViewPortInstruction = function addViewPortInstruction(viewPortName, strategy, moduleId, component) {
+    var config = Object.assign({}, this.lifecycleArgs[1], { currentViewPort: viewPortName });
     var viewportInstruction = this.viewPortInstructions[viewPortName] = {
       name: viewPortName,
       strategy: strategy,
       moduleId: moduleId,
       component: component,
       childRouter: component.childRouter,
-      lifecycleArgs: this.lifecycleArgs.slice()
+      lifecycleArgs: [].concat(this.lifecycleArgs[0], config, this.lifecycleArgs[2])
     };
 
     return viewportInstruction;

diff --git a/dist/es2015/aurelia-router.js b/dist/es2015/aurelia-router.js
@@ -171,13 +171,14 @@ export let NavigationInstruction = class NavigationInstruction {
   }
 
   addViewPortInstruction(viewPortName, strategy, moduleId, component) {
+    const config = Object.assign({}, this.lifecycleArgs[1], { currentViewPort: viewPortName });
     let viewportInstruction = this.viewPortInstructions[viewPortName] = {
       name: viewPortName,
       strategy: strategy,
       moduleId: moduleId,
       component: component,
       childRouter: component.childRouter,
-      lifecycleArgs: this.lifecycleArgs.slice()
+      lifecycleArgs: [].concat(this.lifecycleArgs[0], config, this.lifecycleArgs[2])
     };
 
     return viewportInstruction;

diff --git a/dist/native-modules/aurelia-router.js b/dist/native-modules/aurelia-router.js
@@ -198,13 +198,14 @@ export var NavigationInstruction = function () {
   };
 
   NavigationInstruction.prototype.addViewPortInstruction = function addViewPortInstruction(viewPortName, strategy, moduleId, component) {
+    var config = Object.assign({}, this.lifecycleArgs[1], { currentViewPort: viewPortName });
     var viewportInstruction = this.viewPortInstructions[viewPortName] = {
       name: viewPortName,
       strategy: strategy,
       moduleId: moduleId,
       component: component,
       childRouter: component.childRouter,
-      lifecycleArgs: this.lifecycleArgs.slice()
+      lifecycleArgs: [].concat(this.lifecycleArgs[0], config, this.lifecycleArgs[2])
     };
 
     return viewportInstruction;

diff --git a/dist/system/aurelia-router.js b/dist/system/aurelia-router.js
@@ -811,13 +811,14 @@ System.register(['aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depende
         };
 
         NavigationInstruction.prototype.addViewPortInstruction = function addViewPortInstruction(viewPortName, strategy, moduleId, component) {
+          var config = Object.assign({}, this.lifecycleArgs[1], { currentViewPort: viewPortName });
           var viewportInstruction = this.viewPortInstructions[viewPortName] = {
             name: viewPortName,
             strategy: strategy,
             moduleId: moduleId,
             component: component,
             childRouter: component.childRouter,
-            lifecycleArgs: this.lifecycleArgs.slice()
+            lifecycleArgs: [].concat(this.lifecycleArgs[0], config, this.lifecycleArgs[2])
           };
 
           return viewportInstruction;

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="1.3.0"></a>
+# [1.3.0](https://github.com/aurelia/router/compare/1.2.1...v1.3.0) (2017-04-05)
+
+
+### Features
+
+* **viewport:** add viewport name to life cycle arguments ([34ef2c4](https://github.com/aurelia/router/commit/34ef2c4))
+
+
+
 <a name="1.2.1"></a>
 ## [1.2.1](https://github.com/aurelia/router/compare/1.2.0...v1.2.1) (2017-02-27)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-router",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "A powerful client-side router.",
   "keywords": [
     "aurelia",