Merge branch 'master' of https://github.com/yangmingshan/history into…

… yangmingshan-master

modules/DOMUtils.js

@@ -45,10 +45,24 @@ export function supportsGoWithoutReloadUsingHash() {
 }
 
 /**
- * Returns true if a given popstate event is an extraneous WebKit event.
+ * Returns true if a given popstate event is an extraneous WebKit event,
+ * or it fired on initial page load (the solution is from page.js [https://github.com/visionmedia/page.js]).
  * Accounts for the fact that Chrome on iOS fires real popstate events
  * containing undefined state when pressing the back button.
  */
-export function isExtraneousPopstateEvent(event) {
-  return event.state === undefined && navigator.userAgent.indexOf('CriOS') === -1;
-}
+export const shouldIgnorePopstateEvent = (() => {
+  let loaded = false;
+  if (document.readyState === 'complete') {
+    loaded = true;
+  } else {
+    window.addEventListener('load', () =>
+      setTimeout(() => {
+        loaded = true;
+      })
+    );
+  }
+  return event =>
+    (event.state === undefined &&
+      navigator.userAgent.indexOf('CriOS') === -1) ||
+    !loaded;
+})();

modules/createBrowserHistory.js

@@ -12,7 +12,7 @@ import {
   getConfirmation,
   supportsHistory,
   supportsPopStateOnHashChange,
-  isExtraneousPopstateEvent
+  shouldIgnorePopstateEvent
 } from './DOMUtils.js';
 import invariant from './invariant.js';
 import warning from './warning.js';
@@ -86,8 +86,7 @@ function createBrowserHistory(props = {}) {
   }
 
   function handlePopState(event) {
-    // Ignore extraneous popstate events in WebKit.
-    if (isExtraneousPopstateEvent(event)) return;
+    if (shouldIgnorePopstateEvent(event)) return;
     handlePop(getDOMLocation(event.state));
   }