chore(all): prepare release 1.2.0

aurelia · Oct 2, 2017 · 54c84f8 · 54c84f8
1 parent 29e6a7b
commit 54c84f8
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 25 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-templating-router",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "An implementation of the RouteLoader interface for use with the router module. Also contains a custom element that allows the templating engine to display the current route.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/route-href.js b/dist/amd/route-href.js
@@ -31,15 +31,15 @@ define(['exports', 'aurelia-templating', 'aurelia-dependency-injection', 'aureli
 
   var logger = LogManager.getLogger('route-href');
 
-  var RouteHref = exports.RouteHref = (_dec = (0, _aureliaTemplating.customAttribute)('route-href'), _dec2 = (0, _aureliaTemplating.bindable)({ name: 'route', changeHandler: 'processChange' }), _dec3 = (0, _aureliaTemplating.bindable)({ name: 'params', changeHandler: 'processChange' }), _dec4 = (0, _aureliaTemplating.bindable)({ name: 'attribute', defaultValue: 'href' }), _dec5 = (0, _aureliaDependencyInjection.inject)(_aureliaRouter.Router, _aureliaPal.DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = function () {
+  var RouteHref = exports.RouteHref = (_dec = (0, _aureliaTemplating.customAttribute)('route-href'), _dec2 = (0, _aureliaTemplating.bindable)({ name: 'route', changeHandler: 'processChange', primaryProperty: true }), _dec3 = (0, _aureliaTemplating.bindable)({ name: 'params', changeHandler: 'processChange' }), _dec4 = (0, _aureliaTemplating.bindable)({ name: 'attribute', defaultValue: 'href' }), _dec5 = (0, _aureliaDependencyInjection.inject)(_aureliaRouter.Router, _aureliaPal.DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = function () {
     function RouteHref(router, element) {
 
 
       this.router = router;
       this.element = element;
     }
 
-    RouteHref.prototype.bind = function bind() {
+    RouteHref.prototype.attached = function attached() {
       this.isActive = true;
       this.processChange();
     };

diff --git a/dist/amd/router-view.js b/dist/amd/router-view.js
@@ -128,7 +128,7 @@ define(['exports', 'aurelia-dependency-injection', 'aurelia-binding', 'aurelia-t
         viewPortInstruction.controller = metadata.create(childContainer, _aureliaTemplating.BehaviorInstruction.dynamic(_this.element, viewModel, viewFactory));
 
         if (waitToSwap) {
-          return;
+          return null;
         }
 
         _this.swap(viewPortInstruction);

diff --git a/dist/aurelia-templating-router.d.ts b/dist/aurelia-templating-router.d.ts
@@ -35,7 +35,7 @@ import {
 } from 'aurelia-path';
 export declare class RouteHref {
   constructor(router?: any, element?: any);
-  bind(): any;
+  attached(): any;
   unbind(): any;
   attributeChanged(value?: any, previous?: any): any;
   processChange(): any;

diff --git a/dist/aurelia-templating-router.js b/dist/aurelia-templating-router.js
@@ -10,7 +10,7 @@ import {relativeToFile} from 'aurelia-path';
 const logger = LogManager.getLogger('route-href');
 
 @customAttribute('route-href')
-@bindable({name: 'route', changeHandler: 'processChange'})
+@bindable({name: 'route', changeHandler: 'processChange', primaryProperty: true})
 @bindable({name: 'params', changeHandler: 'processChange'})
 @bindable({name: 'attribute', defaultValue: 'href'})
 @inject(Router, DOM.Element)
@@ -20,7 +20,7 @@ export class RouteHref {
     this.element = element;
   }
 
-  bind() {
+  attached() {
     this.isActive = true;
     this.processChange();
   }
@@ -139,7 +139,7 @@ export class RouterView {
       );
 
       if (waitToSwap) {
-        return;
+        return null;
       }
 
       this.swap(viewPortInstruction);

diff --git a/dist/commonjs/route-href.js b/dist/commonjs/route-href.js
@@ -25,15 +25,15 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 var logger = LogManager.getLogger('route-href');
 
-var RouteHref = exports.RouteHref = (_dec = (0, _aureliaTemplating.customAttribute)('route-href'), _dec2 = (0, _aureliaTemplating.bindable)({ name: 'route', changeHandler: 'processChange' }), _dec3 = (0, _aureliaTemplating.bindable)({ name: 'params', changeHandler: 'processChange' }), _dec4 = (0, _aureliaTemplating.bindable)({ name: 'attribute', defaultValue: 'href' }), _dec5 = (0, _aureliaDependencyInjection.inject)(_aureliaRouter.Router, _aureliaPal.DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = function () {
+var RouteHref = exports.RouteHref = (_dec = (0, _aureliaTemplating.customAttribute)('route-href'), _dec2 = (0, _aureliaTemplating.bindable)({ name: 'route', changeHandler: 'processChange', primaryProperty: true }), _dec3 = (0, _aureliaTemplating.bindable)({ name: 'params', changeHandler: 'processChange' }), _dec4 = (0, _aureliaTemplating.bindable)({ name: 'attribute', defaultValue: 'href' }), _dec5 = (0, _aureliaDependencyInjection.inject)(_aureliaRouter.Router, _aureliaPal.DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = function () {
   function RouteHref(router, element) {
 
 
     this.router = router;
     this.element = element;
   }
 
-  RouteHref.prototype.bind = function bind() {
+  RouteHref.prototype.attached = function attached() {
     this.isActive = true;
     this.processChange();
   };

diff --git a/dist/commonjs/router-view.js b/dist/commonjs/router-view.js
@@ -139,7 +139,7 @@ var RouterView = exports.RouterView = (_dec = (0, _aureliaTemplating.customEleme
       viewPortInstruction.controller = metadata.create(childContainer, _aureliaTemplating.BehaviorInstruction.dynamic(_this.element, viewModel, viewFactory));
 
       if (waitToSwap) {
-        return;
+        return null;
       }
 
       _this.swap(viewPortInstruction);

diff --git a/dist/es2015/route-href.js b/dist/es2015/route-href.js
@@ -8,13 +8,13 @@ import * as LogManager from 'aurelia-logging';
 
 const logger = LogManager.getLogger('route-href');
 
-export let RouteHref = (_dec = customAttribute('route-href'), _dec2 = bindable({ name: 'route', changeHandler: 'processChange' }), _dec3 = bindable({ name: 'params', changeHandler: 'processChange' }), _dec4 = bindable({ name: 'attribute', defaultValue: 'href' }), _dec5 = inject(Router, DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = class RouteHref {
+export let RouteHref = (_dec = customAttribute('route-href'), _dec2 = bindable({ name: 'route', changeHandler: 'processChange', primaryProperty: true }), _dec3 = bindable({ name: 'params', changeHandler: 'processChange' }), _dec4 = bindable({ name: 'attribute', defaultValue: 'href' }), _dec5 = inject(Router, DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = class RouteHref {
   constructor(router, element) {
     this.router = router;
     this.element = element;
   }
 
-  bind() {
+  attached() {
     this.isActive = true;
     this.processChange();
   }

diff --git a/dist/es2015/router-view.js b/dist/es2015/router-view.js
@@ -122,7 +122,7 @@ export let RouterView = (_dec = customElement('router-view'), _dec2 = inject(DOM
       viewPortInstruction.controller = metadata.create(childContainer, BehaviorInstruction.dynamic(this.element, viewModel, viewFactory));
 
       if (waitToSwap) {
-        return;
+        return null;
       }
 
       this.swap(viewPortInstruction);

diff --git a/dist/native-modules/route-href.js b/dist/native-modules/route-href.js
@@ -10,15 +10,15 @@ import * as LogManager from 'aurelia-logging';
 
 var logger = LogManager.getLogger('route-href');
 
-export var RouteHref = (_dec = customAttribute('route-href'), _dec2 = bindable({ name: 'route', changeHandler: 'processChange' }), _dec3 = bindable({ name: 'params', changeHandler: 'processChange' }), _dec4 = bindable({ name: 'attribute', defaultValue: 'href' }), _dec5 = inject(Router, DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = function () {
+export var RouteHref = (_dec = customAttribute('route-href'), _dec2 = bindable({ name: 'route', changeHandler: 'processChange', primaryProperty: true }), _dec3 = bindable({ name: 'params', changeHandler: 'processChange' }), _dec4 = bindable({ name: 'attribute', defaultValue: 'href' }), _dec5 = inject(Router, DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = function () {
   function RouteHref(router, element) {
 
 
     this.router = router;
     this.element = element;
   }
 
-  RouteHref.prototype.bind = function bind() {
+  RouteHref.prototype.attached = function attached() {
     this.isActive = true;
     this.processChange();
   };

diff --git a/dist/native-modules/router-view.js b/dist/native-modules/router-view.js
@@ -127,7 +127,7 @@ export var RouterView = (_dec = customElement('router-view'), _dec2 = inject(DOM
       viewPortInstruction.controller = metadata.create(childContainer, BehaviorInstruction.dynamic(_this.element, viewModel, viewFactory));
 
       if (waitToSwap) {
-        return;
+        return null;
       }
 
       _this.swap(viewPortInstruction);

diff --git a/dist/system/route-href.js b/dist/system/route-href.js
@@ -23,15 +23,15 @@ System.register(['aurelia-templating', 'aurelia-dependency-injection', 'aurelia-
     execute: function () {
       logger = LogManager.getLogger('route-href');
 
-      _export('RouteHref', RouteHref = (_dec = customAttribute('route-href'), _dec2 = bindable({ name: 'route', changeHandler: 'processChange' }), _dec3 = bindable({ name: 'params', changeHandler: 'processChange' }), _dec4 = bindable({ name: 'attribute', defaultValue: 'href' }), _dec5 = inject(Router, DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = function () {
+      _export('RouteHref', RouteHref = (_dec = customAttribute('route-href'), _dec2 = bindable({ name: 'route', changeHandler: 'processChange', primaryProperty: true }), _dec3 = bindable({ name: 'params', changeHandler: 'processChange' }), _dec4 = bindable({ name: 'attribute', defaultValue: 'href' }), _dec5 = inject(Router, DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = function () {
         function RouteHref(router, element) {
 
 
           this.router = router;
           this.element = element;
         }
 
-        RouteHref.prototype.bind = function bind() {
+        RouteHref.prototype.attached = function attached() {
           this.isActive = true;
           this.processChange();
         };

diff --git a/dist/system/router-view.js b/dist/system/router-view.js
@@ -150,7 +150,7 @@ System.register(['aurelia-dependency-injection', 'aurelia-binding', 'aurelia-tem
             viewPortInstruction.controller = metadata.create(childContainer, BehaviorInstruction.dynamic(_this.element, viewModel, viewFactory));
 
             if (waitToSwap) {
-              return;
+              return null;
             }
 
             _this.swap(viewPortInstruction);

diff --git a/dist/temp/aurelia-templating-router.js b/dist/temp/aurelia-templating-router.js
@@ -78,15 +78,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 var logger = LogManager.getLogger('route-href');
 
-var RouteHref = exports.RouteHref = (_dec = (0, _aureliaTemplating.customAttribute)('route-href'), _dec2 = (0, _aureliaTemplating.bindable)({ name: 'route', changeHandler: 'processChange' }), _dec3 = (0, _aureliaTemplating.bindable)({ name: 'params', changeHandler: 'processChange' }), _dec4 = (0, _aureliaTemplating.bindable)({ name: 'attribute', defaultValue: 'href' }), _dec5 = (0, _aureliaDependencyInjection.inject)(_aureliaRouter.Router, _aureliaPal.DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = function () {
+var RouteHref = exports.RouteHref = (_dec = (0, _aureliaTemplating.customAttribute)('route-href'), _dec2 = (0, _aureliaTemplating.bindable)({ name: 'route', changeHandler: 'processChange', primaryProperty: true }), _dec3 = (0, _aureliaTemplating.bindable)({ name: 'params', changeHandler: 'processChange' }), _dec4 = (0, _aureliaTemplating.bindable)({ name: 'attribute', defaultValue: 'href' }), _dec5 = (0, _aureliaDependencyInjection.inject)(_aureliaRouter.Router, _aureliaPal.DOM.Element), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = function () {
   function RouteHref(router, element) {
     _classCallCheck(this, RouteHref);
 
     this.router = router;
     this.element = element;
   }
 
-  RouteHref.prototype.bind = function bind() {
+  RouteHref.prototype.attached = function attached() {
     this.isActive = true;
     this.processChange();
   };
@@ -202,7 +202,7 @@ var RouterView = exports.RouterView = (_dec6 = (0, _aureliaTemplating.customElem
       viewPortInstruction.controller = metadata.create(childContainer, _aureliaTemplating.BehaviorInstruction.dynamic(_this2.element, viewModel, viewFactory));
 
       if (waitToSwap) {
-        return;
+        return null;
       }
 
       _this2.swap(viewPortInstruction);

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,16 @@
+<a name="1.2.0"></a>
+# [1.2.0](https://github.com/aurelia/templating-router/compare/1.1.0...1.2.0) (2017-10-02)
+
+
+### Bug Fixes
+
+* **route-href:** delay route generation until after router's baseURL has been set ([606bf42](https://github.com/aurelia/templating-router/commit/606bf42)), closes [#46](https://github.com/aurelia/templating-router/issues/46)
+* **templating-router:** Silence Bluebirds runaway promise warning ([62ba4e2](https://github.com/aurelia/templating-router/commit/62ba4e2))
+
+### Features
+
+* Use route as default property for route-href
+
 <a name="1.1.0"></a>
 # [1.1.0](https://github.com/aurelia/templating-router/compare/1.0.1...v1.1.0) (2017-02-26)