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

fix(nav): prevents to remove all views in the nav stack

Browse Source 
fixes #9140
This commit is contained in:
Manu Mtz.-Almeida
2016-11-28 01:38:21 +01:00
parent 76df8412b4
commit 16bfb49395
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,7 +378,7 @@ export class NavControllerBase extends Ion implements NavController {
opts.direction = opts.direction || DIRECTION_BACK; opts.direction = opts.direction || DIRECTION_BACK;
} }
const finalBalance = this._views.length + (insertViews ? insertViews.length : 0) - (destroyQueue ? destroyQueue.length : 0); const finalBalance = this._views.length + (insertViews ? insertViews.length : 0) - (removeCount ? removeCount : 0);
assert(finalBalance >= 0, 'final balance can not be negative'); assert(finalBalance >= 0, 'final balance can not be negative');
if (finalBalance === 0 && !this._isPortal) { if (finalBalance === 0 && !this._isPortal) {
console.warn(`You can't remove all the pages in the navigation stack. nav.pop() is probably called too many times.`, console.warn(`You can't remove all the pages in the navigation stack. nav.pop() is probably called too many times.`,

2
src/navigation/test/view-controller.spec.ts
View File

@ -108,6 +108,7 @@ describe('ViewController', () => {
// arrange // arrange
let viewController = mockView(); let viewController = mockView();
let navControllerBase = mockNavController(); let navControllerBase = mockNavController();
navControllerBase._isPortal = true;
mockViews(navControllerBase, [viewController]); mockViews(navControllerBase, [viewController]);
viewController.onDidDismiss((data: any) => { viewController.onDidDismiss((data: any) => {
@ -122,6 +123,7 @@ describe('ViewController', () => {
// arrange // arrange
let viewController = mockView(); let viewController = mockView();
let navControllerBase = mockNavController(); let navControllerBase = mockNavController();
navControllerBase._isPortal = true;
mockViews(navControllerBase, [viewController]); mockViews(navControllerBase, [viewController]);
viewController.onDidDismiss((data: any) => { viewController.onDidDismiss((data: any) => {

2
src/navigation/view-controller.ts
View File

@ -172,7 +172,7 @@ export class ViewController {
* @returns {any} data Returns the data passed in, if any. * @returns {any} data Returns the data passed in, if any.
* *
*/ */
dismiss(data?: any, role?: any, navOptions: NavOptions = {}) { dismiss(data?: any, role?: any, navOptions: NavOptions = {}): Promise<any> {
if (!this._nav) { if (!this._nav) {
return Promise.resolve(false); return Promise.resolve(false);
} }