@cimo/jsmvcfw 1.1.4 → 1.1.5
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.
- package/dist/JsMvcFwRouter.d.ts +1 -2
- package/dist/JsMvcFwRouter.js +26 -20
- package/dist/JsMvcFwRouter.js.map +1 -1
- package/package.json +1 -1
package/dist/JsMvcFwRouter.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Irouter
|
|
2
|
-
export declare const controllerList: Icontroller[];
|
|
1
|
+
import { Irouter } from "./JsMvcFwInterface";
|
|
3
2
|
export declare const routerInit: (routerListValue: Irouter[]) => void;
|
|
4
3
|
export declare const navigateTo: (nextUrl: string, soft?: boolean, parameterList?: Record<string, unknown>, parameterSearch?: string) => void;
|
package/dist/JsMvcFwRouter.js
CHANGED
|
@@ -1,28 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.navigateTo = exports.routerInit =
|
|
3
|
+
exports.navigateTo = exports.routerInit = void 0;
|
|
4
4
|
const JsMvcFw_1 = require("./JsMvcFw");
|
|
5
5
|
const JsMvcFwDom_1 = require("./JsMvcFwDom");
|
|
6
6
|
let elementRoot = null;
|
|
7
7
|
let routerList = [];
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
let controller;
|
|
9
|
+
let variableMethod = null;
|
|
10
10
|
const routerInit = (routerListValue) => {
|
|
11
11
|
elementRoot = document.querySelector("#jsmvcfw_app");
|
|
12
12
|
routerList = routerListValue;
|
|
13
13
|
window.onload = (event) => {
|
|
14
14
|
(0, JsMvcFw_1.writeLog)("@cimo/jsmvcfw => JsMvcFwRouter.ts => onload()", window.location.pathname);
|
|
15
15
|
if (event) {
|
|
16
|
-
(0, JsMvcFw_1.writeLog)("@cimo/jsmvcfw => JsMvcFwRouter.ts => routerInit()", { routerList });
|
|
17
|
-
for (const [key, value] of routerList.entries()) {
|
|
18
|
-
exports.controllerList.push(value.controller());
|
|
19
|
-
variableList.push(exports.controllerList[key].variable());
|
|
20
|
-
for (const name of Object.keys(variableList[key])) {
|
|
21
|
-
document.addEventListener(name, () => {
|
|
22
|
-
(0, JsMvcFwDom_1.updateDataBind)(exports.controllerList[key].view(variableList[key]), variableList[key], name);
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
16
|
populatePage(false, window.location.pathname, false);
|
|
27
17
|
}
|
|
28
18
|
};
|
|
@@ -34,10 +24,8 @@ const routerInit = (routerListValue) => {
|
|
|
34
24
|
};
|
|
35
25
|
window.onbeforeunload = (event) => {
|
|
36
26
|
(0, JsMvcFw_1.writeLog)("@cimo/jsmvcfw => JsMvcFwRouter.ts => onbeforeunload()", { event });
|
|
37
|
-
if (event) {
|
|
38
|
-
|
|
39
|
-
value.destroy(variableList[key]);
|
|
40
|
-
}
|
|
27
|
+
if (event && controller && Object.keys(controller).length > 0 && variableMethod) {
|
|
28
|
+
controller.destroy(variableMethod);
|
|
41
29
|
}
|
|
42
30
|
};
|
|
43
31
|
};
|
|
@@ -50,8 +38,12 @@ exports.navigateTo = navigateTo;
|
|
|
50
38
|
const populatePage = (isHistoryPushEnabled, nextUrl, soft, parameterList, parameterSearch) => {
|
|
51
39
|
let isNotFound = false;
|
|
52
40
|
if (elementRoot) {
|
|
53
|
-
for (const [
|
|
41
|
+
for (const [, value] of routerList.entries()) {
|
|
54
42
|
if (value.path === nextUrl) {
|
|
43
|
+
controller = value.controller();
|
|
44
|
+
if (Object.keys(controller).length > 0) {
|
|
45
|
+
variableMethod = controller.variable();
|
|
46
|
+
}
|
|
55
47
|
if (JsMvcFw_1.urlRoot && isHistoryPushEnabled) {
|
|
56
48
|
const urlRootReplace = JsMvcFw_1.urlRoot.replace(/\/+$/, "");
|
|
57
49
|
routerHistoryPush(`${urlRootReplace}${nextUrl}`, soft, value.title, parameterList);
|
|
@@ -61,9 +53,23 @@ const populatePage = (isHistoryPushEnabled, nextUrl, soft, parameterList, parame
|
|
|
61
53
|
}
|
|
62
54
|
if (!isHistoryPushEnabled || soft) {
|
|
63
55
|
document.title = value.title;
|
|
64
|
-
|
|
56
|
+
if (controller && Object.keys(controller).length > 0 && variableMethod) {
|
|
57
|
+
for (const name of Object.keys(variableMethod)) {
|
|
58
|
+
document.addEventListener(name, () => {
|
|
59
|
+
if (controller && Object.keys(controller).length > 0 && variableMethod) {
|
|
60
|
+
(0, JsMvcFwDom_1.updateDataBind)(controller.view(variableMethod), variableMethod, name);
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
elementRoot.innerHTML = controller.view(variableMethod);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
elementRoot.innerHTML = "";
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
if (controller && Object.keys(controller).length > 0 && variableMethod) {
|
|
71
|
+
controller.event(variableMethod);
|
|
65
72
|
}
|
|
66
|
-
exports.controllerList[key].event(variableList[key]);
|
|
67
73
|
isNotFound = false;
|
|
68
74
|
break;
|
|
69
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsMvcFwRouter.js","sourceRoot":"","sources":["../src/JsMvcFwRouter.ts"],"names":[],"mappings":";;;AACA,uCAA8C;AAC9C,6CAA8C;AAE9C,IAAI,WAAW,GAAmB,IAAI,CAAC;AACvC,IAAI,UAAU,GAAc,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"JsMvcFwRouter.js","sourceRoot":"","sources":["../src/JsMvcFwRouter.ts"],"names":[],"mappings":"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"}
|