fixed publishLocation

This commit is contained in:
Sebastian Frank 2022-04-12 17:07:21 +02:00
parent ef8d571ac5
commit fd613e5a7d
3 changed files with 8 additions and 11 deletions

View File

@ -11,7 +11,6 @@
$location = {
path: l[0],
search: l.length > 1 ? l[1] : "",
categoryPath: l[0].replace(/\/\d{4,99}[^\/]+$/, ""),
push: false,
pop: false,
}

View File

@ -6,6 +6,10 @@ console.log("API Base: ", apiBaseURL)
// update location store
const publishLocation = (_p?: string) => {
const push = !!_p
if (!_p && typeof window !== "undefined") {
_p = window.location?.pathname + window.location?.search
}
let _s: string
if (_p) {
const parts = _p.split("?")
@ -15,15 +19,11 @@ const publishLocation = (_p?: string) => {
}
const newLocation = {
path:
_p || (typeof window !== "undefined" && window.location?.pathname),
search:
_s || (typeof window !== "undefined" && window.location?.search),
push: !!_p,
pop: !_p,
categoryPath: "",
path: _p,
search: _s,
push,
pop: !push,
}
newLocation.categoryPath = newLocation.path.replace(/\/\d{4,99}[^\/]+$/, "")
location.set(newLocation)
}

View File

@ -6,9 +6,7 @@ const initLoc = {
search: (typeof window !== "undefined" && window.location?.search) || "",
push: false,
pop: false,
categoryPath: "",
}
initLoc.categoryPath = initLoc.path.replace(/\/\d{4,99}[^\/]+$/, "")
export const location = writable(initLoc)