Skip to content

Commit f543834

Browse files
committed
feat(forms): renamed control, control-group into ng-control and ng-control-group
1 parent 6bef1c4 commit f543834

11 files changed

+73
-73
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import {ControlValueAccessor} from './control_value_accessor';
99
*
1010
* # Example
1111
* ```
12-
* <input type="checkbox" [control]="rememberLogin">
12+
* <input type="checkbox" [ng-control]="rememberLogin">
1313
* ```
1414
*
1515
* @exportedAs angular2/forms
1616
*/
1717
@Directive({
1818
selector:
19-
'input[type=checkbox][control],input[type=checkbox][form-control],input[type=checkbox][ng-model]',
19+
'input[type=checkbox][ng-control],input[type=checkbox][ng-form-control],input[type=checkbox][ng-model]',
2020
hostListeners: {'change': 'onChange($event.target.checked)'},
2121
hostProperties: {'checked': 'checked'}
2222
})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {ControlValueAccessor} from './control_value_accessor';
22
import {Validators} from '../validators';
33

44
/**
5-
* A directive that bind a [Control] object to a DOM element.
5+
* A directive that bind a [ng-control] object to a DOM element.
66
*
77
* @exportedAs angular2/forms
88
*/

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ const controlGroupBinding = CONST_EXPR(
1010
new Binding(ControlContainerDirective, {toAlias: FORWARD_REF(() => ControlGroupDirective)}));
1111

1212
/**
13-
* Binds a control group to a DOM element.
13+
* Binds a ng-control group to a DOM element.
1414
*
1515
* # Example
1616
*
17-
* In this example, we create a control group, and we bind the login and
17+
* In this example, we create a ng-control group, and we bind the login and
1818
* password controls to the login and password elements.
1919
*
2020
* Here we use {@link formDirectives}, rather than importing each form directive individually, e.g.
@@ -25,10 +25,10 @@ const controlGroupBinding = CONST_EXPR(
2525
* @View({
2626
* directives: [formDirectives],
2727
* template:
28-
* "<form [form-model]='loginForm'>" +
29-
* "<div control-group="credentials">
30-
* "Login <input type='text' control='login'>" +
31-
* "Password <input type='password' control='password'>" +
28+
* "<form [ng-form-model]='loginForm'>" +
29+
* "<div ng-control-group="credentials">
30+
* "Login <input type='text' ng-control='login'>" +
31+
* "Password <input type='password' ng-control='password'>" +
3232
* "<button (click)="onLogin()">Login</button>" +
3333
* "</div>"
3434
* "</form>"
@@ -39,7 +39,7 @@ const controlGroupBinding = CONST_EXPR(
3939
* constructor() {
4040
* this.loginForm = new ControlGroup({
4141
* credentials: new ControlGroup({
42-
* login: new Control(""),
42+
* login: new Cntrol(""),
4343
* password: new Control("")
4444
* })
4545
* });
@@ -55,9 +55,9 @@ const controlGroupBinding = CONST_EXPR(
5555
* @exportedAs angular2/forms
5656
*/
5757
@Directive({
58-
selector: '[control-group]',
58+
selector: '[ng-control-group]',
5959
hostInjector: [controlGroupBinding],
60-
properties: ['name: control-group'],
60+
properties: ['name: ng-control-group'],
6161
lifecycle: [onInit, onDestroy]
6262
})
6363
export class ControlGroupDirective extends ControlContainerDirective {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ const controlNameBinding =
3131
* @View({
3232
* directives: [formDirectives],
3333
* template:
34-
* "<form [form-model]='loginForm'>" +
35-
* "Login <input type='text' control='login'>" +
34+
* "<form [ng-form-model]='loginForm'>" +
35+
* "Login <input type='text' ng-control='login'>" +
3636
* "<button (click)="onLogin()">Login</button>" +
3737
* "</form>"
3838
* })
@@ -55,9 +55,9 @@ const controlNameBinding =
5555
* @exportedAs angular2/forms
5656
*/
5757
@Directive({
58-
selector: '[control]',
58+
selector: '[ng-control]',
5959
hostInjector: [controlNameBinding],
60-
properties: ['name: control', 'model: ng-model'],
60+
properties: ['name: ng-control', 'model: ng-model'],
6161
events: ['ngModel'],
6262
lifecycle: [onDestroy, onChange]
6363
})

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ import {ControlValueAccessor} from './control_value_accessor';
1111
*
1212
* # Example
1313
* ```
14-
* <input type="text" [form-control]="loginControl">
14+
* <input type="text" [ng-form-control]="loginControl">
1515
* ```
1616
*
1717
* @exportedAs angular2/forms
1818
*/
1919
@Directive({
20-
selector: 'input:not([type=checkbox])[control],textarea[control],' +
21-
'input:not([type=checkbox])[form-control],textarea[form-control],' +
22-
'input:not([type=checkbox])[ng-model],textarea[ng-model]',
20+
selector:
21+
'input:not([type=checkbox])[ng-control],textarea[ng-control],input:not([type=checkbox])[ng-form-control],textarea[ng-form-control],input:not([type=checkbox])[ng-model],textarea[ng-model]',
2322
hostListeners:
2423
{'change': 'onChange($event.target.value)', 'input': 'onChange($event.target.value)'},
2524
hostProperties: {'value': 'value'}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const formControlBinding =
3030
* @Component({selector: "login-comp"})
3131
* @View({
3232
* directives: [formDirectives],
33-
* template: "<input type='text' [form-control]='loginControl'>"
33+
* template: "<input type='text' [ng-form-control]='loginControl'>"
3434
* })
3535
* class LoginComp {
3636
* loginControl:Control;
@@ -45,9 +45,9 @@ const formControlBinding =
4545
* @exportedAs angular2/forms
4646
*/
4747
@Directive({
48-
selector: '[form-control]',
48+
selector: '[ng-form-control]',
4949
hostInjector: [formControlBinding],
50-
properties: ['control: form-control', 'model: ng-model'],
50+
properties: ['control: ng-form-control', 'model: ng-model'],
5151
events: ['ngModel'],
5252
lifecycle: [onChange]
5353
})

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ const formDirectiveBinding = CONST_EXPR(
2828
* @Component({selector: "login-comp"})
2929
* @View({
3030
* directives: [formDirectives],
31-
* template: "<form [form-model]='loginForm'>" +
32-
* "Login <input type='text' control='login'>" +
33-
* "Password <input type='password' control='password'>" +
31+
* template: "<form [ng-form-model]='loginForm'>" +
32+
* "Login <input type='text' ng-control='login'>" +
33+
* "Password <input type='password' ng-control='password'>" +
3434
* "<button (click)="onLogin()">Login</button>" +
3535
* "</form>"
3636
* })
@@ -54,9 +54,9 @@ const formDirectiveBinding = CONST_EXPR(
5454
* @exportedAs angular2/forms
5555
*/
5656
@Directive({
57-
selector: '[form-model]',
57+
selector: '[ng-form-model]',
5858
hostInjector: [formDirectiveBinding],
59-
properties: ['form: form-model'],
59+
properties: ['form: ng-form-model'],
6060
lifecycle: [onChange]
6161
})
6262
export class FormModelDirective extends ControlContainerDirective implements FormDirective {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const formControlBinding =
1313
CONST_EXPR(new Binding(ControlDirective, {toAlias: FORWARD_REF(() => NgModelDirective)}));
1414

1515
@Directive({
16-
selector: '[ng-model]:not([control]):not([form-control])',
16+
selector: '[ng-model]:not([ng-control]):not([ng-form-control])',
1717
hostInjector: [formControlBinding],
1818
properties: ['model: ng-model'],
1919
events: ['ngModel'],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import {ControlValueAccessor} from './control_value_accessor';
1111
*
1212
* # Example
1313
* ```
14-
* <input type="text" [control]="loginControl">
14+
* <input type="text" [ng-control]="loginControl">
1515
* ```
1616
*
1717
* @exportedAs angular2/forms
1818
*/
1919
@Directive({
20-
selector: 'select[control],select[form-control],select[ng-model]',
20+
selector: 'select[ng-control],select[ng-form-control],select[ng-model]',
2121
hostListeners:
2222
{'change': 'onChange($event.target.value)', 'input': 'onChange($event.target.value)'},
2323
hostProperties: {'value': 'value'}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const formDirectiveBinding = CONST_EXPR(new Binding(
1414
ControlContainerDirective, {toAlias: FORWARD_REF(() => TemplateDrivenFormDirective)}));
1515

1616
@Directive({
17-
selector: 'form:not([ng-no-form]):not([form-model]),ng-form,[ng-form]',
17+
selector: 'form:not([ng-no-form]):not([ng-form-model]),ng-form,[ng-form]',
1818
hostInjector: [formDirectiveBinding]
1919
})
2020
export class TemplateDrivenFormDirective extends ControlContainerDirective implements

0 commit comments

Comments
 (0)