mirror of
https://github.com/dani-garcia/bw_web_builds.git
synced 2024-10-31 06:44:47 +03:00
Merge pull request #176 from Timshel/feature/subpath
Strip query params when resolving subpath
This commit is contained in:
commit
a044d67904
1 changed files with 2 additions and 2 deletions
|
@ -577,11 +577,11 @@ index c2eb37eea5..2b5ac93392 100644
|
||||||
+ //
|
+ //
|
||||||
+ // - `https://vaultwarden.example.com/base/path/`
|
+ // - `https://vaultwarden.example.com/base/path/`
|
||||||
+ // - `https://vaultwarden.example.com/base/path/#/some/route[?queryParam=...]`
|
+ // - `https://vaultwarden.example.com/base/path/#/some/route[?queryParam=...]`
|
||||||
|
+ // - `https://vaultwarden.example.com/base/path/?queryParam=...`
|
||||||
+ //
|
+ //
|
||||||
+ // We want to get to just `https://vaultwarden.example.com/base/path`.
|
+ // We want to get to just `https://vaultwarden.example.com/base/path`.
|
||||||
+ let baseUrl = this.win.location.href;
|
+ let baseUrl = this.win.location.href;
|
||||||
+ baseUrl = baseUrl.replace(/#.*/, ""); // Strip off `#` and everything after.
|
+ baseUrl = baseUrl.replace(/(\/+|\/*#.*|\/*\?.*)$/, ""); // Strip off trailing `/`, `#`, `?` and everything after.
|
||||||
+ baseUrl = baseUrl.replace(/\/+$/, ""); // Trim any trailing `/` chars.
|
|
||||||
+ const urls = { base: baseUrl };
|
+ const urls = { base: baseUrl };
|
||||||
|
|
||||||
// Find the region
|
// Find the region
|
||||||
|
|
Loading…
Reference in a new issue