Skip to content

Commit 60af19f

Browse files
mheverymhevery
committed
refactor: rename all const to UPPER_CASE
Closes angular#3573 BREAKING CHANGE Rename: - `appComponentTypeToken` => `APP_COMPONENT` - `coreDirectives` => `CORE_DIRECTIVES` - `formDirectives` => `FORM_DIRECTIVES` - `formInjectables` => `FORM_BINDINGS` - `httpInjectables` => `HTTP_BINDINGS` - `jsonpInjectables` => `JSONP_BINDINGS` - `PROTO_CHANGE_DETECTOR_KEY` => `PROTO_CHANGE_DETECTOR` - `appComponentRefPromiseToken` => `APP_COMPONENT_REF_PROMISE` - `appComponentTypeToken` => `APP_COMPONENT` - `undefinedValue` => `UNDEFINED` - `formDirectives` => `FORM_DIRECTIVES` - `DOCUMENT_TOKEN` => `DOCUMENT` - `APP_ID_TOKEN` => `APP_ID` - `MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE_TOKEN` => `MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE` - `appBaseHrefToken` => `APP_BASE_HREF`
1 parent 1d65b38 commit 60af19f

Some content is hidden

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

54 files changed

+203
-205
lines changed

‎modules/angular2/core.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @description
44
* Define angular core API here.
55
*/
6-
export {appComponentTypeToken} from 'angular2/src/core/application_tokens';
6+
export {APP_COMPONENT} from 'angular2/src/core/application_tokens';
77
export {ApplicationRef} from 'angular2/src/core/application_common';
88
export {Type} from 'angular2/src/facade/lang';
99

‎modules/angular2/di.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export {
2626
PUBLIC_AND_PRIVATE,
2727
PUBLIC,
2828
PRIVATE,
29-
undefinedValue
29+
UNDEFINED
3030
} from './src/di/injector';
3131
export {Binding, BindingBuilder, ResolvedBinding, Dependency, bind} from './src/di/binding';
3232
export {Key, KeyRegistry, TypeLiteral} from './src/di/key';

‎modules/angular2/directives.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ export * from './src/directives/ng_switch';
6060
* ```
6161
*
6262
*/
63-
export const coreDirectives: List<Type> =
63+
export const CORE_DIRECTIVES: List<Type> =
6464
CONST_EXPR([NgClass, NgFor, NgIf, NgNonBindable, NgSwitch, NgSwitchWhen, NgSwitchDefault]);

‎modules/angular2/forms.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ export {
3131
NgSelectOption,
3232
SelectControlValueAccessor
3333
} from './src/forms/directives/select_control_value_accessor';
34-
export {formDirectives} from './src/forms/directives';
34+
export {FORM_DIRECTIVES} from './src/forms/directives';
3535
export {Validators} from './src/forms/validators';
3636
export {NgValidator, NgRequiredValidator} from './src/forms/directives/validators';
3737
export {FormBuilder} from './src/forms/form_builder';
3838

3939
import {FormBuilder} from './src/forms/form_builder';
4040
import {CONST_EXPR, Type} from './src/facade/lang';
4141

42-
export const formInjectables: List<Type> = CONST_EXPR([FormBuilder]);
42+
export const FORM_BINDINGS: List<Type> = CONST_EXPR([FormBuilder]);

‎modules/angular2/render.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export {
1515
RenderFragmentRef,
1616
RenderViewWithFragments,
1717
ViewDefinition,
18-
DOCUMENT_TOKEN,
19-
APP_ID_TOKEN,
18+
DOCUMENT,
19+
APP_ID,
2020
DOM_REFLECT_PROPERTIES_AS_ATTRIBUTES,
21-
MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE_TOKEN
21+
MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE
2222
} from './src/render/render';

‎modules/angular2/router.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export {RouteRegistry} from './src/router/route_registry';
1313
export {LocationStrategy} from './src/router/location_strategy';
1414
export {HashLocationStrategy} from './src/router/hash_location_strategy';
1515
export {HTML5LocationStrategy} from './src/router/html5_location_strategy';
16-
export {Location, appBaseHrefToken} from './src/router/location';
16+
export {Location, APP_BASE_HREF} from './src/router/location';
1717
export {Pipeline} from './src/router/pipeline';
1818
export * from './src/router/route_config_decorator';
1919
export * from './src/router/route_definition';
@@ -31,7 +31,7 @@ import {RouterLink} from './src/router/router_link';
3131
import {RouteRegistry} from './src/router/route_registry';
3232
import {Pipeline} from './src/router/pipeline';
3333
import {Location} from './src/router/location';
34-
import {appComponentTypeToken} from './src/core/application_tokens';
34+
import {APP_COMPONENT} from './src/core/application_tokens';
3535
import {bind} from './di';
3636
import {CONST_EXPR} from './src/facade/lang';
3737
import {List} from './src/facade/collection';
@@ -46,5 +46,5 @@ export var routerInjectables: List<any> = [
4646
bind(Router)
4747
.toFactory((registry, pipeline, location,
4848
appRoot) => { return new RootRouter(registry, pipeline, location, appRoot);},
49-
[RouteRegistry, Pipeline, Location, appComponentTypeToken])
49+
[RouteRegistry, Pipeline, Location, APP_COMPONENT])
5050
];

‎modules/angular2/src/change_detection/change_detection.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const defaultKeyValueDiffers = CONST_EXPR(new KeyValueDiffers(keyValDiff)
7272
// dart2js. See https://github.com/dart-lang/sdk/issues/23630 for details.
7373
export var preGeneratedProtoDetectors: StringMap<string, Function> = {};
7474

75-
export const PROTO_CHANGE_DETECTOR_KEY = CONST_EXPR(new OpaqueToken('ProtoChangeDetectors'));
75+
export const PROTO_CHANGE_DETECTOR = CONST_EXPR(new OpaqueToken('ProtoChangeDetectors'));
7676

7777
/**
7878
* Implements change detection using a map of pregenerated proto detectors.
@@ -82,7 +82,7 @@ export class PreGeneratedChangeDetection extends ChangeDetection {
8282
_dynamicChangeDetection: ChangeDetection;
8383
_protoChangeDetectorFactories: StringMap<string, Function>;
8484

85-
constructor(@Inject(PROTO_CHANGE_DETECTOR_KEY) @Optional() protoChangeDetectorsForTest?:
85+
constructor(@Inject(PROTO_CHANGE_DETECTOR) @Optional() protoChangeDetectorsForTest?:
8686
StringMap<string, Function>) {
8787
super();
8888
this._dynamicChangeDetection = new DynamicChangeDetection();

‎modules/angular2/src/core/application_common.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory';
6060
import {Renderer, RenderCompiler} from 'angular2/src/render/api';
6161
import {
6262
DomRenderer,
63-
DOCUMENT_TOKEN,
63+
DOCUMENT,
6464
DOM_REFLECT_PROPERTIES_AS_ATTRIBUTES,
6565
DefaultDomCompiler,
6666
APP_ID_RANDOM_BINDING,
67-
MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE_TOKEN,
67+
MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE,
6868
TemplateCloner
6969
} from 'angular2/src/render/render';
7070
import {ElementSchemaRegistry} from 'angular2/src/render/dom/schema/element_schema_registry';
@@ -74,7 +74,7 @@ import {
7474
DomSharedStylesHost
7575
} from 'angular2/src/render/dom/view/shared_styles_host';
7676
import {internalView} from 'angular2/src/core/compiler/view_ref';
77-
import {appComponentRefPromiseToken, appComponentTypeToken} from './application_tokens';
77+
import {APP_COMPONENT_REF_PROMISE, APP_COMPONENT} from './application_tokens';
7878
import {wtfInit} from '../profile/wtf_init';
7979

8080
var _rootInjector: Injector;
@@ -90,11 +90,11 @@ function _injectorBindings(appComponentType): List<Type | Binding | List<any>> {
9090
bestChangeDetection = JitChangeDetection;
9191
}
9292
return [
93-
bind(DOCUMENT_TOKEN)
93+
bind(DOCUMENT)
9494
.toValue(DOM.defaultDoc()),
9595
bind(DOM_REFLECT_PROPERTIES_AS_ATTRIBUTES).toValue(false),
96-
bind(appComponentTypeToken).toValue(appComponentType),
97-
bind(appComponentRefPromiseToken)
96+
bind(APP_COMPONENT).toValue(appComponentType),
97+
bind(APP_COMPONENT_REF_PROMISE)
9898
.toFactory(
9999
(dynamicComponentLoader, injector, testability, registry) => {
100100
// TODO(rado): investigate whether to support bindings on root component.
@@ -107,7 +107,7 @@ function _injectorBindings(appComponentType): List<Type | Binding | List<any>> {
107107
[DynamicComponentLoader, Injector, Testability, TestabilityRegistry]),
108108

109109
bind(appComponentType)
110-
.toFactory((p: Promise<any>) => p.then(ref => ref.instance), [appComponentRefPromiseToken]),
110+
.toFactory((p: Promise<any>) => p.then(ref => ref.instance), [APP_COMPONENT_REF_PROMISE]),
111111
bind(LifeCycle).toFactory((exceptionHandler) => new LifeCycle(null, assertionsEnabled()),
112112
[ExceptionHandler]),
113113
bind(EventManager)
@@ -122,7 +122,7 @@ function _injectorBindings(appComponentType): List<Type | Binding | List<any>> {
122122
bind(Renderer).toAlias(DomRenderer),
123123
APP_ID_RANDOM_BINDING,
124124
TemplateCloner,
125-
bind(MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE_TOKEN).toValue(20),
125+
bind(MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE).toValue(20),
126126
DefaultDomCompiler,
127127
bind(ElementSchemaRegistry).toValue(new DomElementSchemaRegistry()),
128128
bind(RenderCompiler).toAlias(DefaultDomCompiler),
@@ -305,7 +305,7 @@ export function commonBootstrap(
305305
exceptionHandler = appInjector.get(ExceptionHandler);
306306
zone.overrideOnErrorHandler((e, s) => exceptionHandler.call(e, s));
307307

308-
var compRefToken: Promise<any> = appInjector.get(appComponentRefPromiseToken);
308+
var compRefToken: Promise<any> = appInjector.get(APP_COMPONENT_REF_PROMISE);
309309
var tick = (componentRef) => {
310310
var appChangeDetector = internalView(componentRef.hostView).changeDetector;
311311
// retrieve life cycle: may have already been created if injected in root component

‎modules/angular2/src/core/application_tokens.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
44
/**
55
* @private
66
*/
7-
export const appComponentRefPromiseToken = CONST_EXPR(new OpaqueToken('Promise<ComponentRef>'));
7+
export const APP_COMPONENT_REF_PROMISE = CONST_EXPR(new OpaqueToken('Promise<ComponentRef>'));
88

99
/**
1010
* An opaque token representing the application root type in the {@link Injector}.
@@ -22,4 +22,4 @@ export const appComponentRefPromiseToken = CONST_EXPR(new OpaqueToken('Promise<C
2222
*
2323
* ```
2424
*/
25-
export const appComponentTypeToken: OpaqueToken = CONST_EXPR(new OpaqueToken('RootComponent'));
25+
export const APP_COMPONENT: OpaqueToken = CONST_EXPR(new OpaqueToken('AppComponent'));

‎modules/angular2/src/core/compiler/element_injector.ts‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
PUBLIC_AND_PRIVATE,
1616
PUBLIC,
1717
PRIVATE,
18-
undefinedValue,
18+
UNDEFINED,
1919
Key,
2020
Dependency,
2121
bind,
@@ -645,7 +645,7 @@ export class ElementInjector extends TreeNode<ElementInjector> implements Depend
645645
}
646646
}
647647

648-
return undefinedValue;
648+
return UNDEFINED;
649649
}
650650

651651
private _buildAttribute(dep: DirectiveDependency): string {
@@ -892,41 +892,41 @@ class ElementInjectorInlineStrategy implements _ElementInjectorStrategy {
892892
var p = i.protoStrategy;
893893
i.resetConstructionCounter();
894894

895-
if (p.binding0 instanceof DirectiveBinding && isPresent(p.keyId0) && i.obj0 === undefinedValue)
895+
if (p.binding0 instanceof DirectiveBinding && isPresent(p.keyId0) && i.obj0 === UNDEFINED)
896896
i.obj0 = i.instantiateBinding(p.binding0, p.visibility0);
897-
if (p.binding1 instanceof DirectiveBinding && isPresent(p.keyId1) && i.obj1 === undefinedValue)
897+
if (p.binding1 instanceof DirectiveBinding && isPresent(p.keyId1) && i.obj1 === UNDEFINED)
898898
i.obj1 = i.instantiateBinding(p.binding1, p.visibility1);
899-
if (p.binding2 instanceof DirectiveBinding && isPresent(p.keyId2) && i.obj2 === undefinedValue)
899+
if (p.binding2 instanceof DirectiveBinding && isPresent(p.keyId2) && i.obj2 === UNDEFINED)
900900
i.obj2 = i.instantiateBinding(p.binding2, p.visibility2);
901-
if (p.binding3 instanceof DirectiveBinding && isPresent(p.keyId3) && i.obj3 === undefinedValue)
901+
if (p.binding3 instanceof DirectiveBinding && isPresent(p.keyId3) && i.obj3 === UNDEFINED)
902902
i.obj3 = i.instantiateBinding(p.binding3, p.visibility3);
903-
if (p.binding4 instanceof DirectiveBinding && isPresent(p.keyId4) && i.obj4 === undefinedValue)
903+
if (p.binding4 instanceof DirectiveBinding && isPresent(p.keyId4) && i.obj4 === UNDEFINED)
904904
i.obj4 = i.instantiateBinding(p.binding4, p.visibility4);
905-
if (p.binding5 instanceof DirectiveBinding && isPresent(p.keyId5) && i.obj5 === undefinedValue)
905+
if (p.binding5 instanceof DirectiveBinding && isPresent(p.keyId5) && i.obj5 === UNDEFINED)
906906
i.obj5 = i.instantiateBinding(p.binding5, p.visibility5);
907-
if (p.binding6 instanceof DirectiveBinding && isPresent(p.keyId6) && i.obj6 === undefinedValue)
907+
if (p.binding6 instanceof DirectiveBinding && isPresent(p.keyId6) && i.obj6 === UNDEFINED)
908908
i.obj6 = i.instantiateBinding(p.binding6, p.visibility6);
909-
if (p.binding7 instanceof DirectiveBinding && isPresent(p.keyId7) && i.obj7 === undefinedValue)
909+
if (p.binding7 instanceof DirectiveBinding && isPresent(p.keyId7) && i.obj7 === UNDEFINED)
910910
i.obj7 = i.instantiateBinding(p.binding7, p.visibility7);
911-
if (p.binding8 instanceof DirectiveBinding && isPresent(p.keyId8) && i.obj8 === undefinedValue)
911+
if (p.binding8 instanceof DirectiveBinding && isPresent(p.keyId8) && i.obj8 === UNDEFINED)
912912
i.obj8 = i.instantiateBinding(p.binding8, p.visibility8);
913-
if (p.binding9 instanceof DirectiveBinding && isPresent(p.keyId9) && i.obj9 === undefinedValue)
913+
if (p.binding9 instanceof DirectiveBinding && isPresent(p.keyId9) && i.obj9 === UNDEFINED)
914914
i.obj9 = i.instantiateBinding(p.binding9, p.visibility9);
915915
}
916916

917917
dehydrate() {
918918
var i = this.injectorStrategy;
919919

920-
i.obj0 = undefinedValue;
921-
i.obj1 = undefinedValue;
922-
i.obj2 = undefinedValue;
923-
i.obj3 = undefinedValue;
924-
i.obj4 = undefinedValue;
925-
i.obj5 = undefinedValue;
926-
i.obj6 = undefinedValue;
927-
i.obj7 = undefinedValue;
928-
i.obj8 = undefinedValue;
929-
i.obj9 = undefinedValue;
920+
i.obj0 = UNDEFINED;
921+
i.obj1 = UNDEFINED;
922+
i.obj2 = UNDEFINED;
923+
i.obj3 = UNDEFINED;
924+
i.obj4 = UNDEFINED;
925+
i.obj5 = UNDEFINED;
926+
i.obj6 = UNDEFINED;
927+
i.obj7 = UNDEFINED;
928+
i.obj8 = UNDEFINED;
929+
i.obj9 = UNDEFINED;
930930
}
931931

932932
callOnDestroy(): void {
@@ -1012,43 +1012,43 @@ class ElementInjectorInlineStrategy implements _ElementInjectorStrategy {
10121012
var p = i.protoStrategy;
10131013

10141014
if (isPresent(p.binding0) && p.binding0.key.token === query.selector) {
1015-
if (i.obj0 === undefinedValue) i.obj0 = i.instantiateBinding(p.binding0, p.visibility0);
1015+
if (i.obj0 === UNDEFINED) i.obj0 = i.instantiateBinding(p.binding0, p.visibility0);
10161016
list.push(i.obj0);
10171017
}
10181018
if (isPresent(p.binding1) && p.binding1.key.token === query.selector) {
1019-
if (i.obj1 === undefinedValue) i.obj1 = i.instantiateBinding(p.binding1, p.visibility1);
1019+
if (i.obj1 === UNDEFINED) i.obj1 = i.instantiateBinding(p.binding1, p.visibility1);
10201020
list.push(i.obj1);
10211021
}
10221022
if (isPresent(p.binding2) && p.binding2.key.token === query.selector) {
1023-
if (i.obj2 === undefinedValue) i.obj2 = i.instantiateBinding(p.binding2, p.visibility2);
1023+
if (i.obj2 === UNDEFINED) i.obj2 = i.instantiateBinding(p.binding2, p.visibility2);
10241024
list.push(i.obj2);
10251025
}
10261026
if (isPresent(p.binding3) && p.binding3.key.token === query.selector) {
1027-
if (i.obj3 === undefinedValue) i.obj3 = i.instantiateBinding(p.binding3, p.visibility3);
1027+
if (i.obj3 === UNDEFINED) i.obj3 = i.instantiateBinding(p.binding3, p.visibility3);
10281028
list.push(i.obj3);
10291029
}
10301030
if (isPresent(p.binding4) && p.binding4.key.token === query.selector) {
1031-
if (i.obj4 === undefinedValue) i.obj4 = i.instantiateBinding(p.binding4, p.visibility4);
1031+
if (i.obj4 === UNDEFINED) i.obj4 = i.instantiateBinding(p.binding4, p.visibility4);
10321032
list.push(i.obj4);
10331033
}
10341034
if (isPresent(p.binding5) && p.binding5.key.token === query.selector) {
1035-
if (i.obj5 === undefinedValue) i.obj5 = i.instantiateBinding(p.binding5, p.visibility5);
1035+
if (i.obj5 === UNDEFINED) i.obj5 = i.instantiateBinding(p.binding5, p.visibility5);
10361036
list.push(i.obj5);
10371037
}
10381038
if (isPresent(p.binding6) && p.binding6.key.token === query.selector) {
1039-
if (i.obj6 === undefinedValue) i.obj6 = i.instantiateBinding(p.binding6, p.visibility6);
1039+
if (i.obj6 === UNDEFINED) i.obj6 = i.instantiateBinding(p.binding6, p.visibility6);
10401040
list.push(i.obj6);
10411041
}
10421042
if (isPresent(p.binding7) && p.binding7.key.token === query.selector) {
1043-
if (i.obj7 === undefinedValue) i.obj7 = i.instantiateBinding(p.binding7, p.visibility7);
1043+
if (i.obj7 === UNDEFINED) i.obj7 = i.instantiateBinding(p.binding7, p.visibility7);
10441044
list.push(i.obj7);
10451045
}
10461046
if (isPresent(p.binding8) && p.binding8.key.token === query.selector) {
1047-
if (i.obj8 === undefinedValue) i.obj8 = i.instantiateBinding(p.binding8, p.visibility8);
1047+
if (i.obj8 === UNDEFINED) i.obj8 = i.instantiateBinding(p.binding8, p.visibility8);
10481048
list.push(i.obj8);
10491049
}
10501050
if (isPresent(p.binding9) && p.binding9.key.token === query.selector) {
1051-
if (i.obj9 === undefinedValue) i.obj9 = i.instantiateBinding(p.binding9, p.visibility9);
1051+
if (i.obj9 === UNDEFINED) i.obj9 = i.instantiateBinding(p.binding9, p.visibility9);
10521052
list.push(i.obj9);
10531053
}
10541054
}
@@ -1072,15 +1072,15 @@ class ElementInjectorDynamicStrategy implements _ElementInjectorStrategy {
10721072

10731073
for (var i = 0; i < p.keyIds.length; i++) {
10741074
if (p.bindings[i] instanceof DirectiveBinding && isPresent(p.keyIds[i]) &&
1075-
inj.objs[i] === undefinedValue) {
1075+
inj.objs[i] === UNDEFINED) {
10761076
inj.objs[i] = inj.instantiateBinding(p.bindings[i], p.visibilities[i]);
10771077
}
10781078
}
10791079
}
10801080

10811081
dehydrate(): void {
10821082
var inj = this.injectorStrategy;
1083-
ListWrapper.fill(inj.objs, undefinedValue);
1083+
ListWrapper.fill(inj.objs, UNDEFINED);
10841084
}
10851085

10861086
callOnDestroy(): void {
@@ -1119,7 +1119,7 @@ class ElementInjectorDynamicStrategy implements _ElementInjectorStrategy {
11191119

11201120
for (var i = 0; i < p.bindings.length; i++) {
11211121
if (p.bindings[i].key.token === query.selector) {
1122-
if (ist.objs[i] === undefinedValue) {
1122+
if (ist.objs[i] === UNDEFINED) {
11231123
ist.objs[i] = ist.instantiateBinding(p.bindings[i], p.visibilities[i]);
11241124
}
11251125
list.push(ist.objs[i]);

0 commit comments

Comments
 (0)