Use shortened URL in pushState

Earlier we were using the full URL, now only query string is passed in pushState, much cleaner!
kiwix · Jun 24, 2022 · 45c4cd6 · 45c4cd6
1 parent 7f409e3
commit 45c4cd6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/static/skin/index.js b/static/skin/index.js
@@ -357,7 +357,7 @@
         params = new URLSearchParams(window.location.search);
         if (filterType) {
             params.set(filterType, filterValue);
-            window.history.pushState({}, null, `${window.location.href.split('?')[0]}?${params.toString()}`);
+            window.history.pushState({}, null, `?${params.toString()}`);
             setCookie(filterCookieName, params.toString());
         }
         updateFilterColors();
@@ -468,8 +468,8 @@
         const tagElement = document.getElementsByClassName('tagFilterLabel')[0];
         tagElement.addEventListener('click', () => removeTagElement(true));
         if (filters) {
-            const currentLink = window.location.href;
-            const newLink = `${window.location.href.split('?')[0]}?${params.toString()}`;
+            const currentLink = window.location.search;
+            const newLink = `?${params.toString()}`;
             if (currentLink != newLink) {
                 window.history.pushState({}, null, newLink);       
             } 

diff --git a/test/server.cpp b/test/server.cpp
@@ -184,7 +184,7 @@ R"EXPECTEDRESULT(      src="/ROOT/skin/jquery-ui/external/jquery/jquery.js?cache
           src: url("/ROOT/skin/fonts/Roboto.ttf?cacheid=84d10248") format("truetype");
     <script src="/ROOT/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
     <script src="/ROOT/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
-    <script type="text/javascript" src="/ROOT/skin/index.js?cacheid=0d938055" defer></script>
+    <script type="text/javascript" src="/ROOT/skin/index.js?cacheid=9e54956e" defer></script>
 )EXPECTEDRESULT"
     },
     {