fix: don't invoke callback if not present in start

router5 · Jul 23, 2015 · 3ecc838 · 3ecc838
1 parent 49cf678
commit 3ecc838
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/modules/Router5.js b/modules/Router5.js
@@ -99,7 +99,7 @@ export default class Router5 {
 
         let cb = (err) => {
             window.addEventListener('popstate', this.onPopState.bind(this))
-            done(err)
+            if (done) done(err)
         }
 
         let navigateToDefault = () => this.navigate(opts.defaultRoute, opts.defaultParams, {replace: true}, cb)
@@ -114,7 +114,11 @@ export default class Router5 {
                 else if (opts.defaultRoute) navigateToDefault()
                 else cb(err)
             })
-        } else if (opts.defaultRoute) navigateToDefault()
+        } else if (opts.defaultRoute) {
+            navigateToDefault()
+        } else {
+            cb()
+        }
         // Listen to popstate
         return this
     }