Merge pull request #154 from aksonov/delian-patch-fast-click

Stop popping if there is nowhere to go
aksonov · Jan 28, 2016 · 2594f96 · 2594f96
2 parents 28b94b8 + 0fe8ba5
commit 2594f96
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Actions.js b/Actions.js
@@ -99,8 +99,12 @@ class Actions {
             debug("Pop, router="+router.name+" stack length:"+router.stack.length);
             debug("Current route="+router.currentRoute.name+" type="+router.currentRoute.type);
             while (router.stack.length <= 1 || router.currentRoute.type === 'switch'){
-                router = router.parentRoute.parent;
-                debug("Switching to parent router="+router.name);
+                if (router.parentRoute) {
+                  router = router.parentRoute.parent;
+                  debug("Switching to parent router="+router.name);
+                } else {
+                  break;
+                }
             }
             if (router.pop()){
                 this.currentRouter = router;

diff --git a/Router.js b/Router.js
@@ -200,7 +200,7 @@ export default class Router {
 
     pop(num: number = 1){
         if (this._stack.length <= num){
-            throw new Error("Cannot pop(), stack=["+this._stack+"]");
+            return false;
         }
         this.nextRoute = null;
         if (this.delegate.onPop && this.delegate.onPop(num)){
@@ -219,4 +219,4 @@ export default class Router {
 
 function capitalizeFirstLetter(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
-}
+}