@cimo/jsmvcfw 1.3.14 → 1.3.15

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.
Files changed (3) hide show
  1. package/dist/src/JsMvcFwRoute.js +13 -19
  2. package/dist/src/JsMvcFwRoute.js.map +1 -1
  3. package/package.json +1 -1
package/dist/src/JsMvcFwRoute.js CHANGED
@@ -49,17 +49,17 @@ const removeController = () => {
49
49
  }
50
50
  };
51
51
  const populatePage = (urlNext, isSoft, parameterObject, parameterSearch) => {
52
- let isNotFound = true;
53
- for (const route of routeList) {
54
- if (route.path === urlNext) {
55
- isNotFound = false;
56
- if (!isSoft) {
57
- if (parameterSearch) {
58
- window.location.search = parameterSearch;
59
- }
60
- window.location.href = cleanUrl(urlNext);
61
- }
62
- else {
52
+ if (!isSoft) {
53
+ if (parameterSearch) {
54
+ window.location.search = parameterSearch;
55
+ }
56
+ window.location.href = cleanUrl(urlNext);
57
+ }
58
+ else {
59
+ let isNotFound = true;
60
+ for (const route of routeList) {
61
+ if (route.path === urlNext) {
62
+ isNotFound = false;
63
63
  (0, JsMvcFw_1.resetFramework)();
64
64
  historyPush(urlNext, parameterObject, parameterSearch, route.title);
65
65
  document.title = route.title;
@@ -71,16 +71,10 @@ const populatePage = (urlNext, isSoft, parameterObject, parameterSearch) => {
71
71
  controller.rendered();
72
72
  });
73
73
  });
74
+ break;
74
75
  }
75
- break;
76
- }
77
- }
78
- if (isNotFound) {
79
- if (!isSoft) {
80
- window.location.search = "";
81
- window.location.href = cleanUrl("/404");
82
76
  }
83
- else {
77
+ if (isNotFound) {
84
78
  historyPush("/404", parameterObject, parameterSearch, "404");
85
79
  document.title = "404";
86
80
  const elementRoot = document.getElementById("jsmvcfw_app");
package/dist/src/JsMvcFwRoute.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"JsMvcFwRoute.js","sourceRoot":"","sources":["../../src/JsMvcFwRoute.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JsMvcFwRoute.js","sourceRoot":"","sources":["../../src/JsMvcFwRoute.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cimo/jsmvcfw",
3
- "version": "1.3.14",
3
+ "version": "1.3.15",
4
4
  "description": "Javascript mvc framework. Light, fast and secure.",
5
5
  "author": "cimo",
6
6
  "license": "MIT",