honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(upgrade): add missing Angular 1 type info

This commit is contained in:
Peter Bacon Darwin 2016-11-02 20:33:55 +00:00 committed by Victor Berchet
parent a659259962
commit 79671a6f12
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/@angular/upgrade/src/angular_js.ts
View File

@ -23,6 +23,7 @@ export interface IModule {
controller(name: string, type: IInjectable): IModule; controller(name: string, type: IInjectable): IModule;
factory(key: Ng1Token, factoryFn: IInjectable): IModule; factory(key: Ng1Token, factoryFn: IInjectable): IModule;
value(key: Ng1Token, value: any): IModule; value(key: Ng1Token, value: any): IModule;
constant(token: Ng1Token, value: any): IModule;
run(a: IInjectable): IModule; run(a: IInjectable): IModule;
} }
export interface ICompileService { export interface ICompileService {
@ -42,6 +43,7 @@ export interface IRootScopeService {
$parent: IScope; $parent: IScope;
$root: IScope; $root: IScope;
$watch(expr: any, fn?: (a1?: any, a2?: any) => void): Function; $watch(expr: any, fn?: (a1?: any, a2?: any) => void): Function;
$on(event: string, fn?: (event?: any, ...args: any[]) => void): Function;
$destroy(): any; $destroy(): any;
$apply(): any; $apply(): any;
$apply(exp: string): any; $apply(exp: string): any;
@ -118,6 +120,7 @@ export type IAugmentedJQuery = Node[] & {
append?: (content: IAugmentedJQuery | string) => IAugmentedJQuery; append?: (content: IAugmentedJQuery | string) => IAugmentedJQuery;
controller?: (name: string) => any; controller?: (name: string) => any;
isolateScope?: () => IScope; isolateScope?: () => IScope;
injector?: () => IInjectorService;
}; };
export interface IProvider { $get: IInjectable; } export interface IProvider { $get: IInjectable; }
export interface IProvideService { export interface IProvideService {

2
modules/@angular/upgrade/src/upgrade_adapter.ts
View File

@ -333,7 +333,7 @@ export class UpgradeAdapter {
.value(NG2_COMPONENT_FACTORY_REF_MAP, componentFactoryRefMap) .value(NG2_COMPONENT_FACTORY_REF_MAP, componentFactoryRefMap)
.config([ .config([
'$provide', '$injector', '$provide', '$injector',
(provide: any /** TODO #???? */, ng1Injector: angular.IInjectorService) => { (provide: angular.IProvideService, ng1Injector: angular.IInjectorService) => {
provide.decorator(NG1_ROOT_SCOPE, [ provide.decorator(NG1_ROOT_SCOPE, [
'$delegate', '$delegate',
function(rootScopeDelegate: angular.IRootScopeService) { function(rootScopeDelegate: angular.IRootScopeService) {