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

fix(tabs): fix tabs rootNav

Browse Source
This commit is contained in:
Adam Bradley
2016-06-21 14:37:57 -05:00
parent ed6d0fa13b
commit ae40edf810
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,7 +509,7 @@ export class Tabs extends Ion {
*/ */
get rootNav(): NavController { get rootNav(): NavController {
let nav = this.parent; let nav = this.parent;
while (nav.parent) { while (nav && nav.parent) {
nav = nav.parent; nav = nav.parent;
} }
return nav; return nav;

2
src/util/ui-event-manager.ts
View File

@ -120,7 +120,7 @@ export class UIEventManager {
return this.listen(ref.nativeElement, eventName, callback, option); return this.listen(ref.nativeElement, eventName, callback, option);
} }
pointerEventsRef(ref: ElementRef, pointerStart: any, pointerMove: any, pointerEnd: any, option?: any): Function { pointerEventsRef(ref: ElementRef, pointerStart: any, pointerMove: any, pointerEnd: any, option?: any): PointerEvents {
return this.pointerEvents(ref.nativeElement, pointerStart, pointerMove, pointerEnd, option); return this.pointerEvents(ref.nativeElement, pointerStart, pointerMove, pointerEnd, option);
} }