@trullock/page-manager 0.13.1 → 0.13.3
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/package.json +1 -1
- package/src/index.js +3 -4
package/package.json
CHANGED
package/src/index.js
CHANGED
|
@@ -109,15 +109,14 @@ function showLoading() {
|
|
|
109
109
|
}
|
|
110
110
|
};
|
|
111
111
|
|
|
112
|
-
var page = pageCache[route.pattern].page;
|
|
113
|
-
|
|
112
|
+
var page = (pageCache[route.path] || pageCache[route.pattern]).page;
|
|
114
113
|
return Promise.resolve(page.show(data));
|
|
115
114
|
}
|
|
116
115
|
|
|
117
116
|
function hideLoading() {
|
|
118
117
|
var pageLookup = pageHash[options.loadingPageName];
|
|
119
118
|
var route = router.parse(pageLookup.route);
|
|
120
|
-
var page = pageCache[route.pattern].page;
|
|
119
|
+
var page = (pageCache[route.path] || pageCache[route.pattern]).page;
|
|
121
120
|
return Promise.resolve(page.hide());
|
|
122
121
|
}
|
|
123
122
|
|
|
@@ -505,7 +504,7 @@ export function navigate(url, data, checkBeforeHide = true) {
|
|
|
505
504
|
|
|
506
505
|
url = expandOnlyHash(url);
|
|
507
506
|
|
|
508
|
-
if (checkBeforeHide === true && stack[stackPointer].page.beforeHide
|
|
507
|
+
if (checkBeforeHide === true && options.beforeHide && stack[stackPointer].page.beforeHide) {
|
|
509
508
|
|
|
510
509
|
var interrupt = stack[stackPointer].page.beforeHide();
|
|
511
510
|
if (interrupt) {
|