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

fix(back-button): implements back animation

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-03-08 19:27:37 +01:00
parent 8b6df5abbd
commit 64a787a9de
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/src/components/back-button/back-button.tsx
View File

@ -50,7 +50,7 @@ export class BackButton {
ev.preventDefault(); ev.preventDefault();
nav.pop(); nav.pop();
} else if (this.defaultHref) { } else if (this.defaultHref) {
openURL(this.defaultHref, ev); openURL(this.defaultHref, ev, true);
} }
} }

4
packages/core/src/components/router/router.tsx
View File

@ -69,8 +69,8 @@ export class Router {
} }
@Method() @Method()
pushURL(url: string) { pushURL(url: string, isPop = false) {
this.writePath(parsePath(url), false); this.writePath(parsePath(url), isPop);
return this.writeNavStateRoot(); return this.writeNavStateRoot();
} }

4
packages/core/src/utils/theme.ts
View File

@ -62,12 +62,12 @@ export function getClassMap(classes: string | undefined): CssClassMap {
return map; return map;
} }
export function openURL(url: string, ev: Event) { export function openURL(url: string, ev: Event, isPop = false) {
if (url && url.indexOf('://') === -1) { if (url && url.indexOf('://') === -1) {
const router = document.querySelector('ion-router'); const router = document.querySelector('ion-router');
if (router) { if (router) {
ev && ev.preventDefault(); ev && ev.preventDefault();
return router.componentOnReady().then(() => router.pushURL(url)); return router.componentOnReady().then(() => router.pushURL(url, isPop));
} }
} }
return Promise.resolve(); return Promise.resolve();