Skip to content

Commit a8e277b

Browse files
mheverymprobst
mhevery
authored and
mprobst
committed
chore: remove const Provider() in favor of /* @ts2dart_Provider */ {provide:}
1 parent 3aa322a commit a8e277b

59 files changed

Lines changed: 305 additions & 234 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/angular2/platform/testing/browser_static.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function createNgZone(): NgZone {
4747
* Default platform providers for testing without a compiler.
4848
*/
4949
export const TEST_BROWSER_STATIC_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
50-
/*@ts2dart_const*/ [
50+
/*@ts2dart_const*/[
5151
PLATFORM_COMMON_PROVIDERS,
5252
/*@ts2dart_Provider*/{provide: PLATFORM_INITIALIZER, useValue: initBrowserTests, multi: true}
5353
];

‎modules/angular2/platform/testing/server.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ function initServerTests() {
4949
* Default platform providers for testing.
5050
*/
5151
export const TEST_SERVER_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
52-
/*@ts2dart_const*/ [
52+
/*@ts2dart_const*/[
5353
PLATFORM_COMMON_PROVIDERS,
54-
/*@ts2dart_Provider*/{provide: PLATFORM_INITIALIZER, useValue: initServerTests, multi: true}
54+
/*@ts2dart_Provider*/ {provide: PLATFORM_INITIALIZER, useValue: initServerTests, multi: true}
5555
];
5656

5757
function appDoc() {
@@ -66,26 +66,26 @@ function appDoc() {
6666
* Default application providers for testing.
6767
*/
6868
export const TEST_SERVER_APPLICATION_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
69-
/*@ts2dart_const*/ [
69+
/*@ts2dart_const*/[
7070
// TODO(julie: when angular2/platform/server is available, use that instead of making our own
7171
// list here.
7272
APPLICATION_COMMON_PROVIDERS,
7373
COMPILER_PROVIDERS,
74-
/*@ts2dart_Provider*/{provide: DOCUMENT, useFactory: appDoc},
75-
/*@ts2dart_Provider*/{provide: DomRootRenderer, useClass: DomRootRenderer_},
76-
/*@ts2dart_Provider*/{provide: RootRenderer, useExisting: DomRootRenderer},
74+
/* @ts2dart_Provider */ {provide: DOCUMENT, useFactory: appDoc},
75+
/* @ts2dart_Provider */ {provide: DomRootRenderer, useClass: DomRootRenderer_},
76+
/* @ts2dart_Provider */ {provide: RootRenderer, useExisting: DomRootRenderer},
7777
EventManager,
78-
/*@ts2dart_Provider*/{provide: EVENT_MANAGER_PLUGINS, useClass: DomEventsPlugin, multi: true},
79-
/*@ts2dart_Provider*/{provide: XHR, useClass: XHR},
80-
/*@ts2dart_Provider*/{provide: APP_ID, useValue: 'a'},
81-
/*@ts2dart_Provider*/{provide: SharedStylesHost, useExisting: DomSharedStylesHost},
78+
/* @ts2dart_Provider */ {provide: EVENT_MANAGER_PLUGINS, useClass: DomEventsPlugin, multi: true},
79+
/* @ts2dart_Provider */ {provide: XHR, useClass: XHR},
80+
/* @ts2dart_Provider */ {provide: APP_ID, useValue: 'a'},
81+
/* @ts2dart_Provider */ {provide: SharedStylesHost, useExisting: DomSharedStylesHost},
8282
DomSharedStylesHost,
8383
ELEMENT_PROBE_PROVIDERS,
84-
/*@ts2dart_Provider*/{provide: DirectiveResolver, useClass: MockDirectiveResolver},
85-
/*@ts2dart_Provider*/{provide: ViewResolver, useClass: MockViewResolver},
84+
/* @ts2dart_Provider */ {provide: DirectiveResolver, useClass: MockDirectiveResolver},
85+
/* @ts2dart_Provider */ {provide: ViewResolver, useClass: MockViewResolver},
8686
Log,
8787
TestComponentBuilder,
88-
/*@ts2dart_Provider*/{provide: NgZone, useFactory: createNgZone},
89-
/*@ts2dart_Provider*/{provide: LocationStrategy, useClass: MockLocationStrategy},
90-
/*@ts2dart_Provider*/{provide: AnimationBuilder, useClass: MockAnimationBuilder},
88+
/* @ts2dart_Provider */ {provide: NgZone, useFactory: createNgZone},
89+
/* @ts2dart_Provider */ {provide: LocationStrategy, useClass: MockLocationStrategy},
90+
/* @ts2dart_Provider */ {provide: AnimationBuilder, useClass: MockAnimationBuilder},
9191
];

‎modules/angular2/platform/worker_render.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export function bootstrapRender(
5757
var app = ReflectiveInjector.resolveAndCreate(
5858
[
5959
WORKER_RENDER_APPLICATION,
60-
new Provider(WORKER_SCRIPT, {useValue: workerScriptUri}),
60+
/* @ts2dart_Provider */ {provide: WORKER_SCRIPT, useValue: workerScriptUri},
6161
isPresent(customProviders) ? customProviders : []
6262
],
6363
workerRenderPlatform().injector);

‎modules/angular2/router/router_link_dsl.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {TEMPLATE_TRANSFORMS} from 'angular2/compiler';
2-
import {Provider} from 'angular2/core';
32
import {RouterLinkTransform} from 'angular2/src/router/directives/router_link_transform';
43

54
export {RouterLinkTransform} from 'angular2/src/router/directives/router_link_transform';
@@ -31,5 +30,8 @@ export {RouterLinkTransform} from 'angular2/src/router/directives/router_link_tr
3130
* ```
3231
*/
3332
export const ROUTER_LINK_DSL_PROVIDER =
34-
/*@ts2dart_const*/
35-
new Provider(TEMPLATE_TRANSFORMS, {useClass: RouterLinkTransform, multi: true});
33+
/*@ts2dart_const*/ /* @ts2dart_Provider */ {
34+
provide: TEMPLATE_TRANSFORMS,
35+
useClass: RouterLinkTransform,
36+
multi: true
37+
};

‎modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ import {Directive, Renderer, ElementRef, Self, forwardRef, Provider} from 'angul
22

33
import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
44

5-
export const CHECKBOX_VALUE_ACCESSOR = /*@ts2dart_const*/ new Provider(
6-
NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => CheckboxControlValueAccessor), multi: true});
5+
export const CHECKBOX_VALUE_ACCESSOR: any = /*@ts2dart_const*/ {
6+
provide: NG_VALUE_ACCESSOR,
7+
useExisting: forwardRef(() => CheckboxControlValueAccessor),
8+
multi: true
9+
};
710

811
/**
912
* The accessor for writing a value and listening to changes on a checkbox input element.

‎modules/angular2/src/common/forms/directives/default_value_accessor.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@ import {Directive, ElementRef, Renderer, Self, forwardRef, Provider} from 'angul
22
import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
33
import {isBlank} from 'angular2/src/facade/lang';
44

5-
export const DEFAULT_VALUE_ACCESSOR = /*@ts2dart_const*/ new Provider(
6-
NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => DefaultValueAccessor), multi: true});
5+
export const DEFAULT_VALUE_ACCESSOR: any = /*@ts2dart_const*/
6+
/* @ts2dart_Provider */ {
7+
provide: NG_VALUE_ACCESSOR,
8+
useExisting: forwardRef(() => DefaultValueAccessor),
9+
multi: true
10+
};
711

812
/**
913
* The default accessor for writing a value and listening to changes that is used by the

‎modules/angular2/src/common/forms/directives/ng_control_group.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ import {Form} from './form_interface';
1818
import {NG_VALIDATORS, NG_ASYNC_VALIDATORS} from '../validators';
1919
import {AsyncValidatorFn, ValidatorFn} from './validators';
2020

21-
export const controlGroupProvider =
22-
/*@ts2dart_const*/
23-
new Provider(ControlContainer, {useExisting: forwardRef(() => NgControlGroup)});
21+
export const controlGroupProvider: any =
22+
/*@ts2dart_const*/ /* @ts2dart_Provider */ {
23+
provide: ControlContainer,
24+
useExisting: forwardRef(() => NgControlGroup)
25+
};
2426

2527
/**
2628
* Creates and binds a control group to a DOM element.

‎modules/angular2/src/common/forms/directives/ng_control_name.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ import {NG_VALIDATORS, NG_ASYNC_VALIDATORS} from '../validators';
3030
import {ValidatorFn, AsyncValidatorFn} from './validators';
3131

3232

33-
export const controlNameBinding =
34-
/*@ts2dart_const*/ new Provider(NgControl, {useExisting: forwardRef(() => NgControlName)});
33+
export const controlNameBinding: any =
34+
/*@ts2dart_const*/ /* @ts2dart_Provider */ {
35+
provide: NgControl,
36+
useExisting: forwardRef(() => NgControlName)
37+
};
3538

3639
/**
3740
* Creates and binds a control with a specified name to a DOM element.

‎modules/angular2/src/common/forms/directives/ng_form.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@ import {AbstractControl, ControlGroup, Control} from '../model';
1515
import {setUpControl, setUpControlGroup, composeValidators, composeAsyncValidators} from './shared';
1616
import {Validators, NG_VALIDATORS, NG_ASYNC_VALIDATORS} from '../validators';
1717

18-
const formDirectiveProvider =
19-
/*@ts2dart_const*/ new Provider(ControlContainer, {useExisting: forwardRef(() => NgForm)});
18+
export const formDirectiveProvider: any =
19+
/*@ts2dart_const*/ /* @ts2dart_Provider */ {
20+
provide: ControlContainer,
21+
useExisting: forwardRef(() => NgForm)
22+
};
2023

2124
/**
2225
* If `NgForm` is bound in a component, `<form>` elements in that component will be

‎modules/angular2/src/common/forms/directives/ng_form_control.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ import {
2424
} from './shared';
2525
import {ValidatorFn, AsyncValidatorFn} from './validators';
2626

27-
const formControlBinding =
28-
/*@ts2dart_const*/ new Provider(NgControl, {useExisting: forwardRef(() => NgFormControl)});
27+
export const formControlBinding: any =
28+
/*@ts2dart_const*/ /* @ts2dart_Provider */ {
29+
provide: NgControl,
30+
useExisting: forwardRef(() => NgFormControl)
31+
};
2932

3033
/**
3134
* Binds an existing {@link Control} to a DOM element.

0 commit comments

Comments
 (0)