javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): resolve merge conflict in vue

Browse Source
This commit is contained in:
Liam DeBeasi
2021-08-18 09:43:32 -04:00
parent c8cbe9c1f3
commit 4c06814494
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/vue/src/components/IonRouterOutlet.ts
View File

@ -85,13 +85,8 @@ export const IonRouterOutlet = /*@__PURE__*/ defineComponent({
* to respond to this gesture, so check * to respond to this gesture, so check
* to make sure the view is in the outlet we want. * to make sure the view is in the outlet we want.
*/ */
<<<<<<< HEAD
const routeInfo = ionRouter.getCurrentRouteInfo();
const enteringViewItem = viewStacks.findViewItemByRouteInfo({ pathname: routeInfo.pushedByRoute || '' }, id);
=======
const routeInfo = ionRouter.getLeavingRouteInfo(); const routeInfo = ionRouter.getLeavingRouteInfo();
const enteringViewItem = viewStacks.findViewItemByRouteInfo({ pathname: routeInfo.pushedByRoute || '' }, id, usingDeprecatedRouteSetup); const enteringViewItem = viewStacks.findViewItemByRouteInfo({ pathname: routeInfo.pushedByRoute || '' }, id);
>>>>>>> origin/main
return !!enteringViewItem; return !!enteringViewItem;
} }