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

fix(nav): setRoot() and setPages() should not animate

Browse Source 
This commit also refactors both methods to avoid deduplicate code,
This commit is contained in:
Manu Mtz.-Almeida
2016-09-16 17:26:09 +02:00
parent c1777c6d18
commit 70127346c4
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/navigation/nav-controller-base.ts
View File

@@ -146,19 +146,26 @@ export class NavControllerBase extends Ion implements NavController {
}
setRoot(pageOrViewCtrl: any, params?: any, opts?: NavOptions, done?: Function): Promise<any> {
return this._queueTrns({
insertStart: 0,
insertViews: [convertToView(this._linker, pageOrViewCtrl, params)],
removeStart: 0,
removeCount: -1,
opts: opts
}, done);
let viewControllers = [convertToView(this._linker, pageOrViewCtrl, params)];
return this._setPages(viewControllers, opts, done);
}
setPages(pages: any[], opts?: NavOptions, done?: Function): Promise<any> {
let viewControllers = convertToViews(this._linker, pages);
return this._setPages(viewControllers, opts, done);
}
_setPages(viewControllers: ViewController[], opts?: NavOptions, done?: Function): Promise<any> {
if (isBlank(opts)) {
opts = {};
}
// if animation wasn't set to true then default it to NOT animate
if (opts.animate !== true) {
opts.animate = false;
}
return this._queueTrns({
insertStart: 0,
insertViews: convertToViews(this._linker, pages),
insertViews: viewControllers,
removeStart: 0,
removeCount: -1,
opts: opts