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

fix(navcontrollerbase): popToRoot should not remove root view

Browse Source
This commit is contained in:
AndreasGassmann
2017-05-03 19:15:23 +02:00
committed by Manu MA
parent 7aa07b05ee
commit 646d736d07
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,7 +331,7 @@ export class NavControllerBase extends Ion implements NavController {
if (ti.removeCount < 0) {
ti.removeCount = (viewsLength - ti.removeStart);
}
ti.leavingRequiresTransition = ((ti.removeStart + ti.removeCount) === viewsLength);
ti.leavingRequiresTransition = (ti.removeCount > 0) && ((ti.removeStart + ti.removeCount) === viewsLength);
}
if (ti.insertViews) {

19
src/navigation/test/nav-controller.spec.ts
View File

@ -622,6 +622,25 @@ describe('NavController', () => {
});
}, 10000);
it('should not pop first view if it\'s the only view', (done: Function) => {
let view1 = mockView(MockView1);
mockViews(nav, [view1]);
nav.popToRoot(null, trnsDone).then(() => {
let hasCompleted = true;
let requiresTransition = false;
expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, undefined, undefined, undefined
);
expect(nav.length()).toEqual(1);
expect(nav.getByIndex(0).component).toEqual(MockView1);
done();
}).catch((err: Error) => {
fail(err);
done(err);
});
}, 10000);
});
describe('remove', () => {