Merge pull request #3461 from dmitrylyzo/fix-popstate

Fix page reload on return

src/components/appRouter.js

@@ -34,16 +34,21 @@ class AppRouter {
 
     constructor() {
         // WebKit fires a popstate event on document load
-        // Skip it using timeout
+        // Skip it using boolean
         // For Tizen 2.x
-        // https://stackoverflow.com/a/12214354
+        // See `page` node module
+        let loaded = document.readyState === 'complete';
+        if (!loaded) {
             window.addEventListener('load', () => {
                 setTimeout(() => {
-                window.addEventListener('popstate', () => {
+                    loaded = true;
-                    this.popstateOccurred = true;
-                });
                 }, 0);
             });
+        }
+        window.addEventListener('popstate', () => {
+            if (!loaded) return;
+            this.popstateOccurred = true;
+        });
 
         document.addEventListener('viewshow', () => this.onViewShow());