diff --git a/package.json b/package.json index 2356a523aed2..8b83ecb916c6 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "@angular/platform-browser": "2.0.0-rc.3", "@angular/platform-browser-dynamic": "2.0.0-rc.3", "@angular/router": "v3.0.0-alpha.8", + "@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 index b027d65f7945..f6fef696b3d7 100644 --- a/src/components/button-toggle/button-toggle.spec.ts +++ b/src/components/button-toggle/button-toggle.spec.ts @@ -8,8 +8,7 @@ import { fakeAsync, tick, } from '@angular/core/testing'; -// TODO(iveysaur): Update to @angular/forms when we have rc.2 -import {NgControl} from '@angular/common'; +import {NgControl, disableDeprecatedForms, provideForms} from '@angular/forms'; import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; import {Component, DebugElement, provide} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -30,6 +29,8 @@ describe('MdButtonToggle', () => { let dispatcher: MdUniqueSelectionDispatcher; beforeEachProviders(() => [ + disableDeprecatedForms(), + provideForms(), provide(MdUniqueSelectionDispatcher, {useFactory: () => { dispatcher = new MdUniqueSelectionDispatcher(); return dispatcher; diff --git a/src/components/button-toggle/button-toggle.ts b/src/components/button-toggle/button-toggle.ts index 543ea3367b43..2aa3734d4065 100644 --- 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/README.md b/src/components/checkbox/README.md index e7cfc28a36d4..4efc10ccf5b4 100644 --- a/src/components/checkbox/README.md +++ b/src/components/checkbox/README.md @@ -27,7 +27,7 @@ A demo of the checkbox can be found at https://plnkr.co/edit/P7qce8lN9n2flS6kBhD ### Usage within Forms In addition to supporting native checkbox functionality, `md-checkbox` also supports `[(ngModel)]` -and `ngControl` for use within forms. +for use within forms. ```html