fix(forms): update packages to use new forms module

kara · kara · commit b7b5faa23331 · 2016-06-24T15:23:27.000-07:00
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "@angular/platform-browser": "2.0.0-rc.1",
     "@angular/platform-browser-dynamic": "2.0.0-rc.1",
     "@angular/router": "2.0.0-rc.1",
+    "@angular/forms": "^0.1.0",
     "core-js": "^2.4.0",
     "hammerjs": "^2.0.8",
     "rxjs": "5.0.0-beta.6",
diff --git a/src/components/button-toggle/button-toggle.spec.ts b/src/components/button-toggle/button-toggle.spec.ts
@@ -9,7 +9,7 @@ import {
   tick,
 } from '@angular/core/testing';
 // TODO(iveysaur): Update to @angular/forms when we have rc.2
-import {NgControl} from '@angular/common';
+import {NgControl} from '@angular/forms';
 import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
 import {Component, DebugElement, provide} from '@angular/core';
 import {By} from '@angular/platform-browser';
diff --git a/src/components/button-toggle/button-toggle.ts b/src/components/button-toggle/button-toggle.ts
@@ -17,7 +17,7 @@ import {
 import {
     NG_VALUE_ACCESSOR,
     ControlValueAccessor,
-} from '@angular/common';
+} from '@angular/forms';
 import {Observable} from 'rxjs/Observable';
 import {
     MdUniqueSelectionDispatcher
diff --git a/src/components/checkbox/checkbox.spec.ts b/src/components/checkbox/checkbox.spec.ts
@@ -7,7 +7,7 @@ import {
     flushMicrotasks,
     tick
 } from '@angular/core/testing';
-import {FORM_DIRECTIVES, NgModel, NgControl} from '@angular/common';
+import {FORM_DIRECTIVES, NgModel, NgControl} from '@angular/forms';
 import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
 import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
diff --git a/src/components/checkbox/checkbox.ts b/src/components/checkbox/checkbox.ts
@@ -11,7 +11,7 @@ import {
     forwardRef,
     AfterContentInit
 } from '@angular/core';
-import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/common';
+import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
 
 /**
  * Monotonically increasing integer used to auto-generate unique ids for checkbox components.
diff --git a/src/components/checkbox/package.json b/src/components/checkbox/package.json
@@ -21,6 +21,7 @@
   },
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
-    "@angular2-material/core": "2.0.0-alpha.5-2"
+    "@angular2-material/core": "2.0.0-alpha.5-2",
+    "@angular/forms": "^0.1.0"
   }
 }
diff --git a/src/components/input/input.ts b/src/components/input/input.ts
@@ -20,8 +20,8 @@ import {
   NG_VALUE_ACCESSOR,
   ControlValueAccessor,
   NgModel,
-  NgIf,
-} from '@angular/common';
+} from '@angular/forms';
+import {NgIf} from '@angular/common';
 import {BooleanFieldValue} from '@angular2-material/core/annotations/field-value';
 import {MdError} from '@angular2-material/core/errors/error';
 import {Observable} from 'rxjs/Observable';
diff --git a/src/components/input/package.json b/src/components/input/package.json
@@ -23,6 +23,7 @@
   },
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
-    "@angular2-material/core": "2.0.0-alpha.5-2"
+    "@angular2-material/core": "2.0.0-alpha.5-2",
+    "@angular/forms": "^0.1.0"
   }
 }
diff --git a/src/components/radio/package.json b/src/components/radio/package.json
@@ -21,6 +21,7 @@
   },
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
-    "@angular2-material/core": "2.0.0-alpha.5-2"
+    "@angular2-material/core": "2.0.0-alpha.5-2",
+    "@angular/forms": "^0.1.0"
   }
 }
diff --git a/src/components/radio/radio.spec.ts b/src/components/radio/radio.spec.ts
@@ -8,7 +8,7 @@ import {
   fakeAsync,
   tick
 } from '@angular/core/testing';
-import {FORM_DIRECTIVES, NgControl} from '@angular/common';
+import {FORM_DIRECTIVES, NgControl} from '@angular/forms';
 import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
 import {Component, DebugElement, provide} from '@angular/core';
 import {By} from '@angular/platform-browser';
diff --git a/src/components/radio/radio.ts b/src/components/radio/radio.ts
@@ -17,7 +17,7 @@ import {
 import {
   NG_VALUE_ACCESSOR,
   ControlValueAccessor
-} from '@angular/common';
+} from '@angular/forms';
 import {
   MdUniqueSelectionDispatcher
 } from '@angular2-material/core/coordination/unique-selection-dispatcher';
diff --git a/src/components/slide-toggle/package.json b/src/components/slide-toggle/package.json
@@ -23,6 +23,7 @@
   },
   "homepage": "https://github.com/angular/material2#readme",
   "peerDependencies": {
-    "@angular2-material/core": "2.0.0-alpha.5-2"
+    "@angular2-material/core": "2.0.0-alpha.5-2",
+    "@angular/forms": "^0.1.0"
   }
 }
diff --git a/src/components/slide-toggle/slide-toggle.spec.ts b/src/components/slide-toggle/slide-toggle.spec.ts
@@ -10,7 +10,7 @@ import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'
 import {By} from '@angular/platform-browser';
 import {Component} from '@angular/core';
 import {MdSlideToggle, MdSlideToggleChange} from './slide-toggle';
-import {NgControl} from '@angular/common';
+import {NgControl} from '@angular/forms';
 
 describe('MdSlideToggle', () => {
   let builder: TestComponentBuilder;
diff --git a/src/components/slide-toggle/slide-toggle.ts b/src/components/slide-toggle/slide-toggle.ts
@@ -12,7 +12,7 @@ import {
 import {
   ControlValueAccessor,
   NG_VALUE_ACCESSOR
-} from '@angular/common';
+} from '@angular/forms';
 import { BooleanFieldValue } from '@angular2-material/core/annotations/field-value';
 import { Observable } from 'rxjs/Observable';
 
diff --git a/src/demo-app/checkbox/checkbox-demo.html b/src/demo-app/checkbox/checkbox-demo.html
@@ -5,7 +5,7 @@ <h1>md-checkbox: Basic Example</h1>
              (change)="isIndeterminate = false"
              [indeterminate]="isIndeterminate"
              [disabled]="isDisabled"
-             [align]="alignment">
+             [align]="alignment" name="foo">
   Do you want to <em>foobar</em> the <em>bazquux</em>?
 
 </md-checkbox> - <strong>{{printResult()}}</strong>
diff --git a/src/demo-app/checkbox/checkbox-demo.ts b/src/demo-app/checkbox/checkbox-demo.ts
@@ -1,5 +1,6 @@
 import {Component} from '@angular/core';
-import {NgFor, FORM_DIRECTIVES} from '@angular/common';
+import {NgFor} from '@angular/common';
+import {FORM_DIRECTIVES} from '@angular/forms';
 import {MdCheckbox} from '@angular2-material/checkbox/checkbox';
 
 export interface Task {
diff --git a/src/demo-app/grid-list/grid-list-demo.ts b/src/demo-app/grid-list/grid-list-demo.ts
@@ -1,5 +1,6 @@
 import {Component} from '@angular/core';
-import {NgFor, FORM_DIRECTIVES} from '@angular/common';
+import {NgFor} from '@angular/common';
+import {FORM_DIRECTIVES} from '@angular/forms';
 import {MD_GRID_LIST_DIRECTIVES} from '@angular2-material/grid-list/grid-list';
 import {MdButton} from '@angular2-material/button/button';
 import {MD_CARD_DIRECTIVES} from '@angular2-material/card/card';
diff --git a/src/demo-app/input/input-demo.ts b/src/demo-app/input/input-demo.ts
@@ -1,5 +1,6 @@
 import {Component} from '@angular/core';
-import {FORM_DIRECTIVES, NgFor} from '@angular/common';
+import {NgFor} from '@angular/common';
+import {FORM_DIRECTIVES} from '@angular/forms';
 import {MD_INPUT_DIRECTIVES} from '@angular2-material/input/input';
 import {MdButton} from '@angular2-material/button/button';
 import {MdCard} from '@angular2-material/card/card';
diff --git a/src/demo-app/main.ts b/src/demo-app/main.ts
@@ -4,6 +4,7 @@ import {HTTP_PROVIDERS} from '@angular/http';
 import {ROUTER_PROVIDERS} from '@angular/router';
 import {provide} from '@angular/core';
 import {Renderer} from '@angular/core';
+import {disableDeprecatedForms, provideForms} from '@angular/forms';
 
 import {OVERLAY_CONTAINER_TOKEN} from '@angular2-material/core/overlay/overlay';
 import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer';
@@ -14,11 +15,13 @@ import {MdIconRegistry} from '@angular2-material/icon/icon-registry';
 import {DemoApp} from './demo-app/demo-app';
 
 bootstrap(DemoApp, [
+  disableDeprecatedForms(),
+  provideForms(),
   ROUTER_PROVIDERS,
   MdLiveAnnouncer,
   provide(OVERLAY_CONTAINER_TOKEN, {useValue: createOverlayContainer()}),
   HTTP_PROVIDERS,
   MdIconRegistry,
   Renderer,
-  provide(HAMMER_GESTURE_CONFIG, {useClass: MdGestureConfig})
+  provide(HAMMER_GESTURE_CONFIG, {useClass: MdGestureConfig}),
 ]);
diff --git a/src/demo-app/radio/radio-demo.ts b/src/demo-app/radio/radio-demo.ts
@@ -1,5 +1,6 @@
 import {Component} from '@angular/core';
-import {FORM_DIRECTIVES, NgFor} from '@angular/common';
+import {NgFor} from '@angular/common';
+import {FORM_DIRECTIVES} from '@angular/forms';
 import {MdCheckbox} from '@angular2-material/checkbox/checkbox';
 import {MD_RADIO_DIRECTIVES} from '@angular2-material/radio/radio';
 import {
diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.ts b/src/demo-app/slide-toggle/slide-toggle-demo.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {FORM_DIRECTIVES} from '@angular/common';
+import {FORM_DIRECTIVES} from '@angular/forms';
 import {MdSlideToggle} from '@angular2-material/slide-toggle/slide-toggle';
 
 @Component({
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
@@ -55,6 +55,7 @@ const barrels: string[] = [
   '@angular/common',
   '@angular/compiler',
   '@angular/http',
+  '@angular/forms',
   '@angular/router',
   '@angular/platform-browser',
   '@angular/platform-browser-dynamic',
diff --git a/src/demo-app/tabs/tab-group-demo.ts b/src/demo-app/tabs/tab-group-demo.ts
@@ -1,5 +1,6 @@
 import {Component, ViewEncapsulation} from '@angular/core';
-import {FORM_DIRECTIVES, NgIf, NgFor, AsyncPipe} from '@angular/common';
+import {NgIf, NgFor, AsyncPipe} from '@angular/common';
+import {FORM_DIRECTIVES} from '@angular/forms';
 import {MD_TABS_DIRECTIVES} from '@angular2-material/tabs/tabs';
 import {MdToolbar} from '@angular2-material/toolbar/toolbar';
 import {MdInput} from '@angular2-material/input/input';
diff --git a/src/e2e-app/main.ts b/src/e2e-app/main.ts
@@ -4,6 +4,7 @@ import {HTTP_PROVIDERS} from '@angular/http';
 import {ROUTER_PROVIDERS} from '@angular/router';
 import {provide} from '@angular/core';
 import {Renderer} from '@angular/core';
+import {disableDeprecatedForms, provideForms} from '@angular/forms';
 
 import {OVERLAY_CONTAINER_TOKEN} from '@angular2-material/core/overlay/overlay';
 import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer';
@@ -14,11 +15,13 @@ import {MdIconRegistry} from '@angular2-material/icon/icon-registry';
 import {E2EApp} from './e2e-app/e2e-app';
 
 bootstrap(E2EApp, [
+  disableDeprecatedForms(),
+  provideForms(),
   ROUTER_PROVIDERS,
   MdLiveAnnouncer,
   provide(OVERLAY_CONTAINER_TOKEN, {useValue: createOverlayContainer()}),
   HTTP_PROVIDERS,
   MdIconRegistry,
   Renderer,
-  provide(HAMMER_GESTURE_CONFIG, {useClass: MdGestureConfig})
+  provide(HAMMER_GESTURE_CONFIG, {useClass: MdGestureConfig}),
 ]);

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`},`
`22`	`22`	`"homepage": "https://github.com/angular/material2#readme",`
`23`	`23`	`"peerDependencies": {`
`24`		`- "@angular2-material/core": "2.0.0-alpha.5-2"`
	`24`	`+ "@angular2-material/core": "2.0.0-alpha.5-2",`
	`25`	`+ "@angular/forms": "^0.1.0"`
`25`	`26`	`}`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`},`
`24`	`24`	`"homepage": "https://github.com/angular/material2#readme",`
`25`	`25`	`"peerDependencies": {`
`26`		`- "@angular2-material/core": "2.0.0-alpha.5-2"`
	`26`	`+ "@angular2-material/core": "2.0.0-alpha.5-2",`
	`27`	`+ "@angular/forms": "^0.1.0"`
`27`	`28`	`}`
`28`	`29`	`}`