about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-02-25 14:28:13 +0100
committerThibaut Girka <thib@sitedethib.com>2020-02-25 14:28:13 +0100
commit85933bc9ff5869e69403315a30c3027d59c7e60d (patch)
treeea2bab292d7fdc97f529aa447300017c4ede00af /app/javascript
parent0d41fef50618e3d58255b4f4082326e83ff06982 (diff)
parent7face973fa1c7d6c18b06d427ea0b7a741d11466 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index 5d73caa10..da4884fd3 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/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}`);
     }
   }