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

fix(router): accepts root direction

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-05-11 18:56:29 +02:00
parent 0b27696d30
commit ae9d0c7236
6 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/components/nav/nav.tsx
View File

@ -181,8 +181,6 @@ export class Nav implements NavOutlet {
});
}
const viewController = this.views.find(v => matches(v, id, params));
let resolve: (result: RouteWrite) => void;
const promise = new Promise<RouteWrite>((r) => resolve = r);
let finish: Promise<boolean>;
@ -202,14 +200,19 @@ export class Nav implements NavOutlet {
return p;
}
};
if (viewController) {
finish = this.popTo(viewController, {...commonOpts, direction: 'back'});
} else if (direction === 1) {
finish = this.push(id, params, commonOpts);
} else if (direction === -1) {
finish = this.setRoot(id, params, {...commonOpts, direction: 'back', animated: true});
} else {
if (direction === 0) {
finish = this.setRoot(id, params, commonOpts);
} else {
const viewController = this.views.find(v => matches(v, id, params));
if (viewController) {
finish = this.popTo(viewController, {...commonOpts, direction: 'back'});
} else if (direction === 1) {
finish = this.push(id, params, commonOpts);
} else if (direction === -1) {
finish = this.setRoot(id, params, {...commonOpts, direction: 'back', animated: true});
}
}
return promise;
}