From 066fc6a0cadd7c69549e284e8a307fe8c406c7cb Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Sun, 22 Jul 2018 17:18:59 +0300 Subject: [PATCH] refactor(upgrade): improve internal AngularJS typings (#24937) PR Close #24937 --- packages/upgrade/src/common/angular1.ts | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/upgrade/src/common/angular1.ts b/packages/upgrade/src/common/angular1.ts index e64b8f28ec..3cbe8897d2 100644 --- a/packages/upgrade/src/common/angular1.ts +++ b/packages/upgrade/src/common/angular1.ts @@ -222,7 +222,7 @@ let angular: { bootstrap: (e: Element, modules: (string | IInjectable)[], config?: IAngularBootstrapConfig) => IInjectorService, module: (prefix: string, dependencies?: string[]) => IModule, - element: (e: Element | string) => IAugmentedJQuery, + element: (e: string | Element | Document | IAugmentedJQuery) => IAugmentedJQuery, version: {major: number}, resumeBootstrap: () => void, getTestability: (e: Element) => ITestabilityService @@ -261,8 +261,6 @@ export function getAngularLib(): any { * Resets the AngularJS global. * * Used when AngularJS is loaded lazily, and not available on `window`. - * - * */ export function setAngularJSGlobal(ng: any): void { angular = ng; @@ -271,24 +269,21 @@ export function setAngularJSGlobal(ng: any): void { /** * Returns the current AngularJS global. - * - * */ export function getAngularJSGlobal(): any { return angular; } -export const bootstrap = - (e: Element, modules: (string | IInjectable)[], config?: IAngularBootstrapConfig) => - angular.bootstrap(e, modules, config); +export const bootstrap: typeof angular.bootstrap = (e, modules, config?) => + angular.bootstrap(e, modules, config); -export const module = (prefix: string, dependencies?: string[]) => +export const module: typeof angular.module = (prefix, dependencies?) => angular.module(prefix, dependencies); -export const element = (e: Element | string) => angular.element(e); +export const element: typeof angular.element = e => angular.element(e); -export const resumeBootstrap = () => angular.resumeBootstrap(); +export const resumeBootstrap: typeof angular.resumeBootstrap = () => angular.resumeBootstrap(); -export const getTestability = (e: Element) => angular.getTestability(e); +export const getTestability: typeof angular.getTestability = e => angular.getTestability(e); export let version = angular.version;