about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorManeraKai <manerakai@protonmail.com>2024-08-26 15:30:44 +0300
committerManeraKai <manerakai@protonmail.com>2024-08-26 15:30:53 +0300
commit8828f1ca973e729eaed679c3c2c868c65b36b501 (patch)
tree470512f2ca84c5762e50d9988c168dd838a4e025
parentAdded Koub https://codeberg.org/LibRedirect/browser_extension/issues/146 (diff)
downloadlibredirect-8828f1ca973e729eaed679c3c2c868c65b36b501.zip
Added support for subdirectory https://github.com/libredirect/browser_extension/issues/875
-rw-r--r--src/assets/javascripts/utils.js11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js
index 756b0d03..36271a8a 100644
--- a/src/assets/javascripts/utils.js
+++ b/src/assets/javascripts/utils.js
@@ -24,11 +24,14 @@ function getNextInstance(currentInstanceUrl, instances) {
  * @param {URL} url
  */
 function protocolHost(url) {
-  if (url.username && url.password) return `${url.protocol}//${url.username}:${url.password}@${url.host}`
+  url.pathname = url.pathname.replace(/\/$/, '');
+  if (url.username && url.password) return `${url.protocol}//${url.username}:${url.password}@${url.host}${url.pathname}`
+
+  // workaround
   if (url.pathname == "/TekstoLibre/" && url.host.endsWith("github.io"))
-    // workaround
     return `${url.protocol}//${url.host}${url.pathname.slice(0, -1)}`
-  return `${url.protocol}//${url.host}`
+
+  return `${url.protocol}//${url.host}${url.pathname}`
 }
 
 /**
@@ -221,5 +224,5 @@ export default {
   addressToLatLng,
   getQuery,
   prefsEncoded,
-  convertMapCentre
+  convertMapCentre,
 }