Merge pull request #502 from visionmedia/same-link

Fix querystring prop in context when navigating to the same page
visionmedia · Sep 8, 2018 · f48d3f1 · f48d3f1
2 parents 6a35283 + 0d64311
commit f48d3f1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -448,7 +448,7 @@
         page.replace(path, e.state);
       } else if (isLocation) {
         var loc = page._window.location;
-        page.show(loc.pathname + loc.hash, undefined, undefined, false);
+        page.show(loc.pathname + loc.search + loc.hash, undefined, undefined, false);
       }
     };
   })();

diff --git a/page.js b/page.js
@@ -848,7 +848,7 @@ pathToRegexp_1.tokensToRegExp = tokensToRegExp_1;
         page.replace(path, e.state);
       } else if (isLocation) {
         var loc = page._window.location;
-        page.show(loc.pathname + loc.hash, undefined, undefined, false);
+        page.show(loc.pathname + loc.search + loc.hash, undefined, undefined, false);
       }
     };
   })();

diff --git a/page.mjs b/page.mjs
@@ -842,7 +842,7 @@ pathToRegexp_1.tokensToRegExp = tokensToRegExp_1;
         page.replace(path, e.state);
       } else if (isLocation) {
         var loc = page._window.location;
-        page.show(loc.pathname + loc.hash, undefined, undefined, false);
+        page.show(loc.pathname + loc.search + loc.hash, undefined, undefined, false);
       }
     };
   })();

diff --git a/test/demos/back-demo.html b/test/demos/back-demo.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+<title>Blank page</title>
+<body>
+  <ul class="links">
+    <li><a class="current-page" href="./back-demo.html?key=val#hash">Click me</a></li>
+  </ul>
+
+  <script src="../page.js"></script>
+  <script>
+    page("/test/demos/back-demo.html", function(ctx){
+      console.assert(ctx.querystring === "key=val");
+    });
+  </script>
+</body>