Merge pull request #148 from taguchimail/fix/147

Retain history.state when calling pushstate/replacestate fixes #147
erikringsmuth · May 25, 2016 · b594c20 · b594c20
2 parents 4840d88 + 46abdef
commit b594c20
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/app-router.js b/src/app-router.js
@@ -137,18 +137,19 @@
         path = '#' + path;
       }
     }
+    var currentState = window.history.state;
     if (options && options.replace === true) {
-      window.history.replaceState(null, null, path);
+      window.history.replaceState(currentState, null, path);
     } else {
-      window.history.pushState(null, null, path);
+      window.history.pushState(currentState, null, path);
     }
 
     // dispatch a popstate event
     try {
       var popstateEvent = new PopStateEvent('popstate', {
         bubbles: false,
         cancelable: false,
-        state: {}
+        state: currentState
       });
 
       if ('dispatchEvent_' in window) {
@@ -161,7 +162,7 @@
     } catch(error) {
       // Internet Exploder
       var fallbackEvent = document.createEvent('CustomEvent');
-      fallbackEvent.initCustomEvent('popstate', false, false, { state: {} });
+      fallbackEvent.initCustomEvent('popstate', false, false, { state: currentState });
       window.dispatchEvent(fallbackEvent);
     }
   };