From 33cd77dd865d6c8e5b8c8837d337b0547990a1ff Mon Sep 17 00:00:00 2001 From: Rob Eisenberg Date: Fri, 6 Feb 2015 09:47:02 -0500 Subject: [PATCH] chore(all): prepare release 0.5.5 --- bower.json | 2 +- dist/amd/router.js | 2 ++ dist/commonjs/router.js | 2 ++ dist/es6/router.js | 2 ++ dist/system/router.js | 2 ++ doc/CHANGELOG.md | 8 ++++++++ package.json | 2 +- 7 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 6e0ea81f..51c4cfb9 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "aurelia-router", - "version": "0.5.4", + "version": "0.5.5", "description": "A powerful client-side router.", "keywords": [ "aurelia", diff --git a/dist/amd/router.js b/dist/amd/router.js index 0cd5b4ce..61e88ca5 100644 --- a/dist/amd/router.js +++ b/dist/amd/router.js @@ -197,6 +197,7 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con } navModel.title = navModel.title || config.title; + navModel.settings = config.settings || (config.settings = {}); this.routes.push(config); this.recognizer.add([{ path: config.route, handler: config }]); @@ -211,6 +212,7 @@ define(["exports", "aurelia-route-recognizer", "aurelia-path", "./navigation-con }]); withChild.navModel = navModel; + withChild.settings = config.settings; } config.navModel = navModel; diff --git a/dist/commonjs/router.js b/dist/commonjs/router.js index 3c84b9c4..60db8bc8 100644 --- a/dist/commonjs/router.js +++ b/dist/commonjs/router.js @@ -196,6 +196,7 @@ var Router = exports.Router = (function () { } navModel.title = navModel.title || config.title; + navModel.settings = config.settings || (config.settings = {}); this.routes.push(config); this.recognizer.add([{ path: config.route, handler: config }]); @@ -210,6 +211,7 @@ var Router = exports.Router = (function () { }]); withChild.navModel = navModel; + withChild.settings = config.settings; } config.navModel = navModel; diff --git a/dist/es6/router.js b/dist/es6/router.js index 9e194fa7..b0c4ac27 100644 --- a/dist/es6/router.js +++ b/dist/es6/router.js @@ -165,6 +165,7 @@ export class Router { } navModel.title = navModel.title || config.title; + navModel.settings = config.settings || (config.settings = {}); this.routes.push(config); this.recognizer.add([{path:config.route, handler: config}]); @@ -179,6 +180,7 @@ export class Router { }]); withChild.navModel = navModel; + withChild.settings = config.settings; } config.navModel = navModel; diff --git a/dist/system/router.js b/dist/system/router.js index 36286f49..1dd7889a 100644 --- a/dist/system/router.js +++ b/dist/system/router.js @@ -207,6 +207,7 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte } navModel.title = navModel.title || config.title; + navModel.settings = config.settings || (config.settings = {}); this.routes.push(config); this.recognizer.add([{ path: config.route, handler: config }]); @@ -221,6 +222,7 @@ System.register(["aurelia-route-recognizer", "aurelia-path", "./navigation-conte }]); withChild.navModel = navModel; + withChild.settings = config.settings; } config.navModel = navModel; diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 310633ae..79acfbf1 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,11 @@ +### 0.5.5 (2015-02-06) + + +#### Features + +* **router:** enable dedicated user setting for route config ([9cc337d0](http://github.com/aurelia/router/commit/9cc337d0be4125c3c500c3bf95f446981dc41511), closes [#23](http://github.com/aurelia/router/issues/23)) + + ### 0.5.4 (2015-02-03) diff --git a/package.json b/package.json index dec8dc17..c0f1c720 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aurelia-router", - "version": "0.5.4", + "version": "0.5.5", "description": "A powerful client-side router.", "keywords": [ "aurelia",