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

fix(navcontroller): filter null viewcontrollers

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2017-04-20 14:36:58 +02:00
parent 9732883165
commit 8605672888
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,12 +341,13 @@ export class NavControllerBase extends Ion implements NavController {
return convertToViews(this._linker, insertViews).then((viewControllers) => { return convertToViews(this._linker, insertViews).then((viewControllers) => {
assert(insertViews.length === viewControllers.length, 'lengths does not match'); assert(insertViews.length === viewControllers.length, 'lengths does not match');
viewControllers = viewControllers.filter(v => v !== null);
if (viewControllers.length === 0) {
throw 'invalid views to insert';
}
// Check all the inserted view are correct // Check all the inserted view are correct
for (var i = 0; i < viewControllers.length; i++) { for (var i = 0; i < viewControllers.length; i++) {
var view = viewControllers[i]; var view = viewControllers[i];
if (!view) {
throw 'invalid views to insert';
}
var nav = view._nav; var nav = view._nav;
if (nav && nav !== this) { if (nav && nav !== this) {
throw 'inserted view was already inserted'; throw 'inserted view was already inserted';