fix(select): update name from ng-value to ngValue

kara · kara · commit 3ca6df87b828 · 2016-04-06T22:47:21.000Z
Closes angular#7939
diff --git a/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts b/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts
@@ -98,7 +98,7 @@ export class NgSelectOption implements OnDestroy {
     if (isPresent(this._select)) this.id = this._select._registerOption();
   }
 
-  @Input('ng-value')
+  @Input('ngValue')
   set ngValue(value: any) {
     if (this._select == null) return;
     this._select._optionMap.set(this.id, value);
diff --git a/modules/angular2/test/common/forms/integration_spec.ts b/modules/angular2/test/common/forms/integration_spec.ts
@@ -438,7 +438,7 @@ export function main() {
                   (tcb: TestComponentBuilder, async) => {
                     var t = `<div>
                       <select [(ngModel)]="selectedCity">
-                        <option *ngFor="#c of list" [ng-value]="c">{{c['name']}}</option>
+                        <option *ngFor="#c of list" [ngValue]="c">{{c['name']}}</option>
                       </select>
                   </div>`;
 
@@ -470,7 +470,7 @@ export function main() {
                   (tcb: TestComponentBuilder, async) => {
                     var t = `<div>
                       <select [(ngModel)]="selectedCity">
-                        <option *ngFor="#c of list" [ng-value]="c">{{c['name']}}</option>
+                        <option *ngFor="#c of list" [ngValue]="c">{{c['name']}}</option>
                       </select>
                   </div>`;
 
@@ -498,7 +498,7 @@ export function main() {
                   (tcb: TestComponentBuilder, async) => {
                     var t = `<div>
                       <select [(ngModel)]="selectedCity">
-                        <option *ngFor="#c of list" [ng-value]="c">{{c}}</option>
+                        <option *ngFor="#c of list" [ngValue]="c">{{c}}</option>
                       </select>
                   </div>`;
                     tcb.overrideTemplate(MyComp, t).createAsync(MyComp).then((fixture) => {
@@ -524,7 +524,7 @@ export function main() {
                   (tcb: TestComponentBuilder, async) => {
                     var t = `<div>
                       <select [(ngModel)]="selectedCity">
-                        <option *ngFor="#c of list; trackBy:customTrackBy" [ng-value]="c">{{c}}</option>
+                        <option *ngFor="#c of list; trackBy:customTrackBy" [ngValue]="c">{{c}}</option>
                       </select>
                   </div>`;
 
@@ -554,7 +554,7 @@ export function main() {
                   (tcb: TestComponentBuilder, async) => {
                     var t = `<div>
                       <select [(ngModel)]="selectedCity">
-                        <option *ngFor="#c of list" [ng-value]="c">{{c}}</option>
+                        <option *ngFor="#c of list" [ngValue]="c">{{c}}</option>
                       </select>
                   </div>`;
 
@@ -583,7 +583,7 @@ export function main() {
                   (tcb: TestComponentBuilder, async) => {
                     var t = `<div>
                       <select [(ngModel)]="selectedCity">
-                        <option *ngFor="#c of list" [ng-value]="c">{{c['name']}}</option>
+                        <option *ngFor="#c of list" [ngValue]="c">{{c['name']}}</option>
                       </select>
                   </div>`;
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ export class NgSelectOption implements OnDestroy {`
`98`	`98`	`if (isPresent(this._select)) this.id = this._select._registerOption();`
`99`	`99`	`}`
`100`	`100`
`101`		`- @Input('ng-value')`
	`101`	`+ @Input('ngValue')`
`102`	`102`	`set ngValue(value: any) {`
`103`	`103`	`if (this._select == null) return;`
`104`	`104`	`this._select._optionMap.set(this.id, value);`