cms/tibi-svelte-starter
Template
4
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

fixed publishLocation

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/App.svelte
View File

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

16
src/index.ts
View File

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

2
src/store.ts
View File

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