chore(all): prepare release 1.2.1

aurelia · Feb 27, 2017 · 5c03ff8 · 5c03ff8
1 parent 8ef8840
commit 5c03ff8
Show file tree

Hide file tree

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

diff --git a/dist/amd/aurelia-router.js b/dist/amd/aurelia-router.js
@@ -1238,8 +1238,7 @@ define(['exports', 'aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depen
 
       if (_viewPortPlan.childNavigationInstruction) {
         findDeactivatable(_viewPortPlan.childNavigationInstruction.plan, callbackName, list);
-      }
-      if (prevComponent) {
+      } else if (prevComponent) {
         addPreviousDeactivatable(prevComponent, callbackName, list);
       }
     }

diff --git a/dist/aurelia-router.js b/dist/aurelia-router.js
@@ -1669,8 +1669,7 @@ function findDeactivatable(plan, callbackName, list: Array<Object> = []): Array<
 
     if (viewPortPlan.childNavigationInstruction) {
       findDeactivatable(viewPortPlan.childNavigationInstruction.plan, callbackName, list);
-    }
-    if (prevComponent) {
+    } else if (prevComponent) {
       addPreviousDeactivatable(prevComponent, callbackName, list);
     }
   }

diff --git a/dist/commonjs/aurelia-router.js b/dist/commonjs/aurelia-router.js
@@ -1193,8 +1193,7 @@ function findDeactivatable(plan, callbackName) {
 
     if (_viewPortPlan.childNavigationInstruction) {
       findDeactivatable(_viewPortPlan.childNavigationInstruction.plan, callbackName, list);
-    }
-    if (prevComponent) {
+    } else if (prevComponent) {
       addPreviousDeactivatable(prevComponent, callbackName, list);
     }
   }

diff --git a/dist/es2015/aurelia-router.js b/dist/es2015/aurelia-router.js
@@ -1040,8 +1040,7 @@ function findDeactivatable(plan, callbackName, list = []) {
 
     if (viewPortPlan.childNavigationInstruction) {
       findDeactivatable(viewPortPlan.childNavigationInstruction.plan, callbackName, list);
-    }
-    if (prevComponent) {
+    } else if (prevComponent) {
       addPreviousDeactivatable(prevComponent, callbackName, list);
     }
   }

diff --git a/dist/native-modules/aurelia-router.js b/dist/native-modules/aurelia-router.js
@@ -1172,8 +1172,7 @@ function findDeactivatable(plan, callbackName) {
 
     if (_viewPortPlan.childNavigationInstruction) {
       findDeactivatable(_viewPortPlan.childNavigationInstruction.plan, callbackName, list);
-    }
-    if (prevComponent) {
+    } else if (prevComponent) {
       addPreviousDeactivatable(prevComponent, callbackName, list);
     }
   }

diff --git a/dist/system/aurelia-router.js b/dist/system/aurelia-router.js
@@ -315,8 +315,7 @@ System.register(['aurelia-logging', 'aurelia-route-recognizer', 'aurelia-depende
 
       if (_viewPortPlan.childNavigationInstruction) {
         findDeactivatable(_viewPortPlan.childNavigationInstruction.plan, callbackName, list);
-      }
-      if (prevComponent) {
+      } else if (prevComponent) {
         addPreviousDeactivatable(prevComponent, callbackName, list);
       }
     }

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="1.2.1"></a>
+## [1.2.1](https://github.com/aurelia/router/compare/1.2.0...v1.2.1) (2017-02-27)
+
+
+### Bug Fixes
+
+* **activation:** regression in deactivate ([8ef8840](https://github.com/aurelia/router/commit/8ef8840))
+
+
+
 <a name="1.2.0"></a>
 # [1.2.0](https://github.com/aurelia/router/compare/1.1.1...v1.2.0) (2017-02-21)
 

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