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

fix(navController): fix this.add and _popTo ref

Browse Source
This commit is contained in:
Adam Bradley
2015-10-09 00:16:25 -05:00
parent 72ad5c1fb5
commit 17f64370fd
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ionic/components/nav/nav-controller.ts
View File

@ -1,4 +1,4 @@
import {ComponentRef, Compiler, ElementRef, Injector, bind, NgZone, DynamicComponentLoader, AppViewManager} from 'angular2/angular2';
import {Compiler, ElementRef, Injector, bind, NgZone, DynamicComponentLoader, AppViewManager} from 'angular2/angular2';
import {Ion} from '../ion';
import {makeComponent} from '../../config/decorators';
@ -305,7 +305,7 @@ export class NavController extends Ion {
* @param opts extra animation options
*/
popToRoot(opts = {}) {
this.popTo(this._views[0]);
this._popTo(this.first());
}
/**
@ -542,7 +542,14 @@ export class NavController extends Ion {
viewContainer.remove(index);
}
};
return new ComponentRef(newLocation, component, type, null, dispose);
// TODO: make-shift ComponentRef_, this is pretty much going to
// break in future versions of ng2, keep an eye on it
return {
location: newLocation,
instance: component,
dispose: dispose
};
}
/**

2
ionic/components/tabs/tabs.ts
View File

@ -146,7 +146,7 @@ export class Tabs extends NavController {
* TODO
*/
addTab(tab) {
this.add(tab.viewCtrl);
this._add(tab.viewCtrl);
// return true/false if it's the initial tab
return (this.length() === 1);