about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-02-25 18:05:52 +0100
committerGitHub <noreply@github.com>2020-02-25 18:05:52 +0100
commit9ee8e1add9f937a75c2514ca88958ff02cf5573c (patch)
treee6c97dfd5a14860b9c825b1c84fb1dd84ada6581 /app/javascript/flavours/glitch
parent0d41fef50618e3d58255b4f4082326e83ff06982 (diff)
parent2f2b48b227304d0f0a28dd4867e84af10b8097ad (diff)
Merge pull request #1289 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch')
-rw-r--r--app/javascript/flavours/glitch/util/main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/util/main.js b/app/javascript/flavours/glitch/util/main.js
index b76826481..1fdb9ff2b 100644
--- a/app/javascript/flavours/glitch/util/main.js
+++ b/app/javascript/flavours/glitch/util/main.js
@@ -12,7 +12,7 @@ function main() {
   if (window.history && history.replaceState) {
     const { pathname, search, hash } = window.location;
     const path = pathname + search + hash;
-    if (!(/^\/web[$/]/).test(path)) {
+    if (!(/^\/web($|\/)/).test(path)) {
       history.replaceState(null, document.title, `/web${path}`);
     }
   }