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

Closes #7939
angular · Apr 6, 2016 · 3ca6df8 · 3ca6df8
1 parent e310bee
commit 3ca6df8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
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>`;