@cimo/jsmvcfw 1.3.18 → 1.3.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -35,6 +35,11 @@ export interface Iroute {
|
|
|
35
35
|
path: string;
|
|
36
36
|
controller(): Icontroller;
|
|
37
37
|
}
|
|
38
|
+
export interface IhistoryPushStateData {
|
|
39
|
+
urlPrevious: string;
|
|
40
|
+
parameterObject: Record<string, unknown> | undefined;
|
|
41
|
+
parameterSearch: string | undefined;
|
|
42
|
+
}
|
|
38
43
|
export interface IcallbackObserver {
|
|
39
44
|
(el: HTMLElement, mutation: MutationRecord): void;
|
|
40
45
|
}
|
package/dist/src/JsMvcFwRoute.js
CHANGED
|
@@ -5,11 +5,7 @@ const JsMvcFw_1 = require("./JsMvcFw");
|
|
|
5
5
|
let routeList = [];
|
|
6
6
|
let controller;
|
|
7
7
|
const cleanUrl = (urlNext) => {
|
|
8
|
-
|
|
9
|
-
if (urlNext !== "/" && urlNext.charAt(0) === "/") {
|
|
10
|
-
url = urlNext.slice(1);
|
|
11
|
-
}
|
|
12
|
-
const [path, queryString] = url.split("?");
|
|
8
|
+
const [path, queryString] = urlNext.split("?");
|
|
13
9
|
const queryStringCleanedList = [];
|
|
14
10
|
if (queryString) {
|
|
15
11
|
const queryStringList = queryString.split("&");
|
|
@@ -31,11 +27,12 @@ const cleanUrl = (urlNext) => {
|
|
|
31
27
|
return urlCleaned;
|
|
32
28
|
};
|
|
33
29
|
const historyPush = (urlNext, parameterObject, parameterSearch, title = "") => {
|
|
34
|
-
|
|
30
|
+
const data = {
|
|
35
31
|
urlPrevious: window.location.pathname,
|
|
36
32
|
parameterObject,
|
|
37
33
|
parameterSearch
|
|
38
|
-
}
|
|
34
|
+
};
|
|
35
|
+
window.history.pushState(data, title, cleanUrl(urlNext));
|
|
39
36
|
};
|
|
40
37
|
const removeController = () => {
|
|
41
38
|
if (controller) {
|
|
@@ -49,19 +46,20 @@ const removeController = () => {
|
|
|
49
46
|
}
|
|
50
47
|
};
|
|
51
48
|
const populatePage = (urlNext, isSoft, parameterObject, parameterSearch) => {
|
|
49
|
+
const urlNextSlice = urlNext.endsWith("/") && urlNext.length > 1 ? urlNext.slice(0, -1) : urlNext;
|
|
52
50
|
if (!isSoft) {
|
|
53
51
|
if (parameterSearch) {
|
|
54
52
|
window.location.search = parameterSearch;
|
|
55
53
|
}
|
|
56
|
-
window.location.href = cleanUrl(
|
|
54
|
+
window.location.href = cleanUrl(urlNextSlice);
|
|
57
55
|
}
|
|
58
56
|
else {
|
|
59
57
|
let isNotFound = true;
|
|
60
58
|
for (const route of routeList) {
|
|
61
|
-
if (route.path ===
|
|
59
|
+
if (route.path === urlNextSlice) {
|
|
62
60
|
isNotFound = false;
|
|
63
61
|
(0, JsMvcFw_1.frameworkReset)();
|
|
64
|
-
historyPush(
|
|
62
|
+
historyPush(urlNextSlice, parameterObject, parameterSearch, route.title);
|
|
65
63
|
document.title = route.title;
|
|
66
64
|
removeController();
|
|
67
65
|
controller = route.controller();
|
|
@@ -92,7 +90,11 @@ const route = (routeListValue) => {
|
|
|
92
90
|
}
|
|
93
91
|
};
|
|
94
92
|
window.onpopstate = (event) => {
|
|
95
|
-
|
|
93
|
+
const data = event.state;
|
|
94
|
+
if (data.urlPrevious) {
|
|
95
|
+
populatePage(data.urlPrevious, true);
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
96
98
|
populatePage(window.location.pathname, true);
|
|
97
99
|
}
|
|
98
100
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsMvcFwRoute.js","sourceRoot":"","sources":["../../src/JsMvcFwRoute.ts"],"names":[],"mappings":";;;AAEA,uCAAuG;AAEvG,IAAI,SAAS,GAAa,EAAE,CAAC;AAC7B,IAAI,UAAuB,CAAC;AAE5B,MAAM,QAAQ,GAAG,CAAC,OAAe,EAAU,EAAE;IACzC,
|
|
1
|
+
{"version":3,"file":"JsMvcFwRoute.js","sourceRoot":"","sources":["../../src/JsMvcFwRoute.ts"],"names":[],"mappings":"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"}
|