refactor(all): componentOnReady is part of the types

This commit is contained in:
Manu Mtz.-Almeida
2018-02-10 01:52:51 +01:00
parent b68e79ab3c
commit 255c3dd1ae
20 changed files with 56 additions and 60 deletions

View File

@ -9,7 +9,7 @@ export class MenuController {
}
close(menuId?: string) {
return (element as any).componentOnReady().then(() => {
return element.componentOnReady().then(() => {
return element.close(menuId);
});
}
@ -24,7 +24,7 @@ export class MenuController {
}
enableAsync(menuId?: string): Promise<HTMLIonMenuElement> {
return (element as any).componentOnReady().then(() => {
return element.componentOnReady().then(() => {
return element.enable(true, menuId);
});
}
@ -38,7 +38,7 @@ export class MenuController {
}
getAsync(menuId?: string): Promise<HTMLIonMenuElement> {
return (element as any).componentOnReady().then(() => {
return element.componentOnReady().then(() => {
return element.get(menuId);
});
}
@ -52,7 +52,7 @@ export class MenuController {
}
getMenusAsync(): Promise<HTMLIonMenuElement[]> {
return (element as any).componentOnReady().then(() => {
return element.componentOnReady().then(() => {
return element.getMenus();
});
}
@ -65,8 +65,8 @@ export class MenuController {
return null;
}
getOpenAsync(): Promise<HTMLIonMenuElement[]> {
return (element as any).componentOnReady().then(() => {
getOpenAsync(): Promise<HTMLIonMenuElement> {
return element.componentOnReady().then(() => {
return element.getOpen();
});
}
@ -80,7 +80,7 @@ export class MenuController {
}
isEnabledAsync(menuId?: string): Promise<boolean> {
return (element as any).componentOnReady().then(() => {
return element.componentOnReady().then(() => {
return element.isEnabled(menuId);
});
}
@ -94,13 +94,13 @@ export class MenuController {
}
isOpenAsync(menuId?: string): Promise<boolean>{
return (element as any).componentOnReady().then(() => {
return element.componentOnReady().then(() => {
return element.isOpen(menuId);
});
}
open(menuId?: string): Promise<boolean> {
return (element as any).componentOnReady().then(() => {
return element.componentOnReady().then(() => {
return element.open(menuId);
});
}
@ -114,13 +114,13 @@ export class MenuController {
}
swipeEnableAsync(shouldEnable: boolean, menuId?: string): Promise<HTMLIonMenuElement> {
return (element as any).componentOnReady().then(() => {
return element.componentOnReady().then(() => {
return element.swipeEnable(shouldEnable, menuId);
});
}
toggle(menuId?: string): Promise<boolean> {
return (element as any).componentOnReady().then(() => {
return element.componentOnReady().then(() => {
return element.toggle(menuId);
});
}

View File

@ -31,7 +31,7 @@ export class ModalController implements FrameworkDelegate {
dismiss(data?: any, role?: string, id?: number) {
const modalController = document.querySelector('ion-modal-controller');
return (modalController as any).componentOnReady().then(() => {
return modalController.componentOnReady().then(() => {
return modalController.dismiss(data, role, id);
});
}

View File

@ -31,7 +31,7 @@ export class PopoverController implements FrameworkDelegate {
dismiss(data?: any, role?: string, id?: number) {
const popoverController = document.querySelector('ion-popover-controller');
return (popoverController as any).componentOnReady().then(() => {
return popoverController.componentOnReady().then(() => {
return popoverController.dismiss(data, role, id);
});
}

View File

@ -116,7 +116,7 @@ export class RouterOutlet implements OnDestroy, OnInit {
export function activateRoute(navElement: HTMLIonNavElement,
component: Type<any>, cfr: ComponentFactoryResolver, injector: Injector): Promise<void> {
return (navElement as any).componentOnReady().then(() => {
return navElement.componentOnReady().then(() => {
// check if the nav has an `<ion-tab>` as a parent
if (isParentTab(navElement)) {
@ -136,8 +136,8 @@ function isParentTab(navElement: HTMLIonNavElement) {
function isTabSelected(tabsElement: HTMLIonTabsElement, tabElement: HTMLIonTabElement ): Promise<boolean> {
const promises: Promise<any>[] = [];
promises.push((tabsElement as any).componentOnReady());
promises.push((tabElement as any).componentOnReady());
promises.push(tabsElement.componentOnReady());
promises.push(tabElement.componentOnReady());
return Promise.all(promises).then(() => {
return tabsElement.getSelected() === tabElement;
});