Merge pull request #219 from jcoffland/master

Fix Firefox back on hash link issue #218.
visionmedia · Feb 5, 2015 · 1f4de38 · 1f4de38
2 parents ba6cb7c + 04378fe
commit 1f4de38
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -185,11 +185,11 @@
    * @api public
    */
 
-  page.show = function(path, state, dispatch) {
+  page.show = function(path, state, dispatch, push) {
     var ctx = new Context(path, state);
     page.current = ctx.path;
     if (false !== dispatch) page.dispatch(ctx);
-    if (false !== ctx.handled) ctx.pushState();
+    if (false !== ctx.handled && false !== push) ctx.pushState();
     return ctx;
   };
 
@@ -504,7 +504,7 @@
       var path = e.state.path;
       page.replace(path, e.state);
     } else {
-      page.show(location.pathname + location.hash);
+      page.show(location.pathname + location.hash, undefined, undefined, false);
     }
   }