Skip to content

Commit 07f092a

Browse files
committed
Core: router rename View/Router global route hooks
1 parent 5bae578 commit 07f092a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/core/components/view/view.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ export default {
8585
// Delays
8686
iosPageLoadDelay: 0,
8787
materialPageLoadDelay: 0,
88+
// Routes hooks
89+
routesBeforeEnter: null,
90+
routesBeforeLeave: null,
8891
},
8992
},
9093
static: {

src/core/modules/router/process-route-queue.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ function processQueue(router, routerQueue, routeQueue, to, from, resolve, reject
3939
export default function (to, from, resolve, reject) {
4040
const router = this;
4141
function enterNextRoute() {
42-
if (to && to.route && (router.params.beforeEnter || to.route.beforeEnter)) {
42+
if (to && to.route && (router.params.routesBeforeEnter || to.route.beforeEnter)) {
4343
router.allowPageChange = false;
4444
processQueue(
4545
router,
46-
router.params.beforeEnter,
46+
router.params.routesBeforeEnter,
4747
to.route.beforeEnter,
4848
to,
4949
from,
@@ -60,11 +60,11 @@ export default function (to, from, resolve, reject) {
6060
}
6161
}
6262
function leaveCurrentRoute() {
63-
if (from && from.route && (router.params.beforeLeave || from.route.beforeLeave)) {
63+
if (from && from.route && (router.params.routesBeforeLeave || from.route.beforeLeave)) {
6464
router.allowPageChange = false;
6565
processQueue(
6666
router,
67-
router.params.beforeLeave,
67+
router.params.routesBeforeLeave,
6868
from.route.beforeLeave,
6969
to,
7070
from,

0 commit comments

Comments
 (0)