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

refactor(): rename ViewController/ViewItem

Browse Source 
Rename ViewController to NavController, ViewItem to ViewController
This commit is contained in:
Adam Bradley
2015-09-23 16:57:25 -05:00
parent fb9fb47c37
commit 89c0a0ef09
28 changed files with 930 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ionic/components/menu/menu-toggle.ts
View File

@@ -2,7 +2,7 @@ import {Directive, ElementRef, Optional} from 'angular2/angular2';
import {Ion} from '../ion';
import {IonicApp} from '../app/app';
import {ViewItem} from '../view/view-item';
import {ViewController} from '../nav/view-controller';
import {Navbar} from '../nav-bar/nav-bar';
@@ -24,12 +24,12 @@ export class MenuToggle extends Ion {
constructor(
app: IonicApp,
elementRef: ElementRef,
@Optional() item: ViewItem,
@Optional() viewCtrl: ViewController,
@Optional() navbar: Navbar
) {
super(elementRef, null);
this.app = app;
this.item = item;
this.viewCtrl = viewCtrl;
this.withinNavbar = !!navbar;
}
@@ -45,8 +45,8 @@ export class MenuToggle extends Ion {
}
get isHidden() {
if (this.withinNavbar && this.item) {
return !this.item.isRoot();
if (this.withinNavbar && this.viewCtrl) {
return !this.viewCtrl.isRoot();
}
return false;
}