Skip to content

Commit c4ecbf0

Browse files
committed
fix: rename FORWARD_REF to forwardRef in the Angular code base.
Now that ts2dart understands forwardRef, there's no need to maintain the old syntax.
1 parent 1346660 commit c4ecbf0

File tree

9 files changed

+17
-19
lines changed

9 files changed

+17
-19
lines changed

modules/angular2/src/di/forward_ref.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ export function forwardRef(forwardRefFn: ForwardRefFn): Type {
3434
return (<Type><any>forwardRefFn);
3535
}
3636

37-
export var FORWARD_REF = forwardRef;
38-
3937
/**
4038
* Lazily retrieve the reference value.
4139
*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import {Directive, Ancestor, onDestroy, onInit} from 'angular2/angular2';
2-
import {Inject, FORWARD_REF, Binding} from 'angular2/di';
2+
import {Inject, forwardRef, Binding} from 'angular2/di';
33
import {List, ListWrapper} from 'angular2/src/facade/collection';
44
import {CONST_EXPR} from 'angular2/src/facade/lang';
55

66
import {ControlContainer} from './control_container';
77
import {controlPath} from './shared';
88

99
const controlGroupBinding =
10-
CONST_EXPR(new Binding(ControlContainer, {toAlias: FORWARD_REF(() => NgControlGroup)}));
10+
CONST_EXPR(new Binding(ControlContainer, {toAlias: forwardRef(() => NgControlGroup)}));
1111

1212
/**
1313
* Creates and binds a control group to a DOM element.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import {CONST_EXPR} from 'angular2/src/facade/lang';
22
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
33
import {List, StringMapWrapper, StringMap} from 'angular2/src/facade/collection';
44
import {Directive, Ancestor, onDestroy, onChange} from 'angular2/angular2';
5-
import {FORWARD_REF, Binding, Inject} from 'angular2/di';
5+
import {forwardRef, Binding, Inject} from 'angular2/di';
66

77
import {ControlContainer} from './control_container';
88
import {NgControl} from './ng_control';
99
import {controlPath} from './shared';
1010
import {Control} from '../model';
1111

1212
const controlNameBinding =
13-
CONST_EXPR(new Binding(NgControl, {toAlias: FORWARD_REF(() => NgControlName)}));
13+
CONST_EXPR(new Binding(NgControl, {toAlias: forwardRef(() => NgControlName)}));
1414

1515
/**
1616
* Creates and binds a control with a specified name to a DOM element.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {PromiseWrapper, ObservableWrapper, EventEmitter} from 'angular2/src/faca
22
import {StringMapWrapper, List, ListWrapper} from 'angular2/src/facade/collection';
33
import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
44
import {Directive} from 'angular2/src/core/annotations/decorators';
5-
import {FORWARD_REF, Binding} from 'angular2/di';
5+
import {forwardRef, Binding} from 'angular2/di';
66
import {NgControl} from './ng_control';
77
import {Form} from './form_interface';
88
import {NgControlGroup} from './ng_control_group';
@@ -11,7 +11,7 @@ import {AbstractControl, ControlGroup, Control} from '../model';
1111
import {setUpControl} from './shared';
1212

1313
const formDirectiveBinding =
14-
CONST_EXPR(new Binding(ControlContainer, {toAlias: FORWARD_REF(() => NgForm)}));
14+
CONST_EXPR(new Binding(ControlContainer, {toAlias: forwardRef(() => NgForm)}));
1515

1616
/**
1717
* Creates and binds a form object to a DOM element.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import {StringMapWrapper} from 'angular2/src/facade/collection';
33
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
44

55
import {Directive, Ancestor, onChange} from 'angular2/angular2';
6-
import {FORWARD_REF, Binding} from 'angular2/di';
6+
import {forwardRef, Binding} from 'angular2/di';
77

88
import {NgControl} from './ng_control';
99
import {Control} from '../model';
1010
import {setUpControl} from './shared';
1111

1212
const formControlBinding =
13-
CONST_EXPR(new Binding(NgControl, {toAlias: FORWARD_REF(() => NgFormControl)}));
13+
CONST_EXPR(new Binding(NgControl, {toAlias: forwardRef(() => NgFormControl)}));
1414

1515
/**
1616
* Binds an existing control to a DOM element.

modules/angular2/src/forms/directives/ng_form_model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {List, ListWrapper} from 'angular2/src/facade/collection';
33
import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async';
44

55
import {Directive, onChange} from 'angular2/angular2';
6-
import {FORWARD_REF, Binding} from 'angular2/di';
6+
import {forwardRef, Binding} from 'angular2/di';
77
import {NgControl} from './ng_control';
88
import {NgControlGroup} from './ng_control_group';
99
import {ControlContainer} from './control_container';
@@ -12,7 +12,7 @@ import {Control, ControlGroup} from '../model';
1212
import {setUpControl} from './shared';
1313

1414
const formDirectiveBinding =
15-
CONST_EXPR(new Binding(ControlContainer, {toAlias: FORWARD_REF(() => NgFormModel)}));
15+
CONST_EXPR(new Binding(ControlContainer, {toAlias: forwardRef(() => NgFormModel)}));
1616

1717
/**
1818
* Binds an existing control group to a DOM element.

modules/angular2/src/forms/directives/ng_model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
33
import {StringMapWrapper} from 'angular2/src/facade/collection';
44

55
import {Directive, Ancestor, onChange} from 'angular2/angular2';
6-
import {FORWARD_REF, Binding} from 'angular2/di';
6+
import {forwardRef, Binding} from 'angular2/di';
77

88
import {NgControl} from './ng_control';
99
import {Control} from '../model';
1010
import {setUpControl} from './shared';
1111

1212
const formControlBinding =
13-
CONST_EXPR(new Binding(NgControl, {toAlias: FORWARD_REF(() => NgModel)}));
13+
CONST_EXPR(new Binding(NgControl, {toAlias: forwardRef(() => NgModel)}));
1414

1515
/**
1616
* Binds a domain model to the form.

modules/angular2/test/core/compiler/integration_spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import {
3434
} from 'angular2/src/facade/lang';
3535
import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
3636

37-
import {Injector, bind, Injectable, Binding, FORWARD_REF, OpaqueToken, Inject} from 'angular2/di';
37+
import {Injector, bind, Injectable, Binding, forwardRef, OpaqueToken, Inject} from 'angular2/di';
3838
import {
3939
PipeRegistry,
4040
defaultPipeRegistry,
@@ -1692,11 +1692,11 @@ function createParentBusView(p) {
16921692
viewInjector: [
16931693
new Binding(
16941694
EventBus,
1695-
{toFactory: createParentBusView, deps: [[FORWARD_REF(() => ParentProvidingEventBus)]]})
1695+
{toFactory: createParentBusView, deps: [[forwardRef(() => ParentProvidingEventBus)]]})
16961696
]
16971697
})
16981698
@View({
1699-
directives: [FORWARD_REF(() => ChildConsumingEventBus)],
1699+
directives: [forwardRef(() => ChildConsumingEventBus)],
17001700
template: `
17011701
<child-consuming-event-bus></child-consuming-event-bus>
17021702
`

modules/angular2_material/src/components/dialog/dialog.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
ComponentRef,
99
DomRenderer
1010
} from 'angular2/angular2';
11-
import {bind, Injector, Injectable, FORWARD_REF} from 'angular2/di';
11+
import {bind, Injector, Injectable, forwardRef} from 'angular2/di';
1212

1313
import {ObservableWrapper, Promise, PromiseWrapper} from 'angular2/src/facade/async';
1414
import {isPresent, Type} from 'angular2/src/facade/lang';
@@ -213,7 +213,7 @@ export class MdDialogConfig {
213213
})
214214
@View({
215215
templateUrl: 'angular2_material/src/components/dialog/dialog.html',
216-
directives: [FORWARD_REF(() => MdDialogContent)]
216+
directives: [forwardRef(() => MdDialogContent)]
217217
})
218218
class MdDialogContainer {
219219
// Ref to the dialog content. Used by the DynamicComponentLoader to load the dialog content.

0 commit comments

Comments
 (0)