Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions src/components/button-toggle/button-toggle.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -30,6 +29,8 @@ describe('MdButtonToggle', () => {
let dispatcher: MdUniqueSelectionDispatcher;

beforeEachProviders(() => [
disableDeprecatedForms(),
provideForms(),
provide(MdUniqueSelectionDispatcher, {useFactory: () => {
dispatcher = new MdUniqueSelectionDispatcher();
return dispatcher;
Expand Down
2 changes: 1 addition & 1 deletion src/components/button-toggle/button-toggle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
import {
NG_VALUE_ACCESSOR,
ControlValueAccessor,
} from '@angular/common';
} from '@angular/forms';
import {Observable} from 'rxjs/Observable';
import {
MdUniqueSelectionDispatcher
Expand Down
2 changes: 1 addition & 1 deletion src/components/checkbox/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
<form (submit)="saveUser()">
Expand Down
20 changes: 16 additions & 4 deletions src/components/checkbox/checkbox.spec.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
import {
it,
beforeEach,
beforeEachProviders,
inject,
async,
fakeAsync,
flushMicrotasks,
tick
} from '@angular/core/testing';
import {FORM_DIRECTIVES, NgModel, NgControl} from '@angular/common';
import {
FORM_DIRECTIVES,
NgModel,
NgControl,
disableDeprecatedForms,
provideForms
} from '@angular/forms';
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
import {Component, DebugElement} from '@angular/core';
import {By} from '@angular/platform-browser';
Expand All @@ -22,6 +29,11 @@ describe('MdCheckbox', () => {
let builder: TestComponentBuilder;
let fixture: ComponentFixture<any>;

beforeEachProviders(() => [
disableDeprecatedForms(),
provideForms(),
]);

beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
builder = tcb;
}));
Expand Down Expand Up @@ -432,7 +444,7 @@ describe('MdCheckbox', () => {
});
});

describe('with ngModel and ngControl', () => {
describe('with ngModel', () => {
beforeEach(async(() => {
builder.createAsync(CheckboxWithFormDirectives).then(f => {
f.detectChanges();
Expand Down Expand Up @@ -501,12 +513,12 @@ class SingleCheckbox {
onCheckboxClick(event: Event) {}
}

/** Simple component for testing an MdCheckbox with ngModel and ngControl. */
/** Simple component for testing an MdCheckbox with ngModel. */
@Component({
directives: [MdCheckbox, FORM_DIRECTIVES, NgModel],
template: `
<form>
<md-checkbox ngControl="cb" [(ngModel)]="isGood">Be good</md-checkbox>
<md-checkbox name="cb" [(ngModel)]="isGood">Be good</md-checkbox>
</form>
`,
})
Expand Down
4 changes: 2 additions & 2 deletions src/components/checkbox/checkbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -20,7 +20,7 @@ let nextId = 0;

/**
* Provider Expression that allows md-checkbox to register as a ControlValueAccessor. This allows it
* to support [(ngModel)] and ngControl.
* to support [(ngModel)].
*/
export const MD_CHECKBOX_CONTROL_VALUE_ACCESSOR = new Provider(
NG_VALUE_ACCESSOR, {
Expand Down
3 changes: 2 additions & 1 deletion src/components/checkbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
7 changes: 7 additions & 0 deletions src/components/input/input.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import {
it,
expect,
beforeEach,
beforeEachProviders,
fakeAsync,
inject,
tick,
} from '@angular/core/testing';
import {TestComponentBuilder} from '@angular/compiler/testing';
import {Component} from '@angular/core';
import {disableDeprecatedForms, provideForms} from '@angular/forms';
import {By} from '@angular/platform-browser';
import {
MdInput,
Expand All @@ -19,6 +21,11 @@ import {
describe('MdInput', function () {
var builder: TestComponentBuilder;

beforeEachProviders(() => [
disableDeprecatedForms(),
provideForms(),
]);

beforeEach(inject([TestComponentBuilder], function (tcb: TestComponentBuilder) {
builder = tcb;
}));
Expand Down
4 changes: 2 additions & 2 deletions src/components/input/input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/components/input/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
3 changes: 2 additions & 1 deletion src/components/radio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 4 additions & 2 deletions src/components/radio/radio.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
fakeAsync,
tick
} from '@angular/core/testing';
import {FORM_DIRECTIVES, NgControl} from '@angular/common';
import {FORM_DIRECTIVES, 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';
Expand All @@ -23,6 +23,8 @@ describe('MdRadio', () => {
let dispatcher: MdUniqueSelectionDispatcher;

beforeEachProviders(() => [
disableDeprecatedForms(),
provideForms(),
provide(MdUniqueSelectionDispatcher, {useFactory: () => {
dispatcher = new MdUniqueSelectionDispatcher();
return dispatcher;
Expand Down Expand Up @@ -278,7 +280,7 @@ describe('MdRadio', () => {
expect(groupInstance.selected.value).toBe(groupInstance.value);
});

it('should have the correct ngControl state initially and after interaction', fakeAsync(() => {
it('should have the correct control state initially and after interaction', fakeAsync(() => {
// The control should start off valid, pristine, and untouched.
expect(groupNgControl.valid).toBe(true);
expect(groupNgControl.pristine).toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion src/components/radio/radio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/components/slide-toggle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
14 changes: 10 additions & 4 deletions src/components/slide-toggle/slide-toggle.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,24 @@ import {
describe,
expect,
beforeEach,
beforeEachProviders,
inject,
async
} from '@angular/core/testing';
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, disableDeprecatedForms, provideForms} from '@angular/forms';

describe('MdSlideToggle', () => {
let builder: TestComponentBuilder;

beforeEachProviders(() => [
disableDeprecatedForms(),
provideForms(),
]);

beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
builder = tcb;
}));
Expand Down Expand Up @@ -244,7 +250,7 @@ describe('MdSlideToggle', () => {
fixture.detectChanges();
});

it('should have the correct ngControl state initially and after interaction', () => {
it('should have the correct control state initially and after interaction', () => {
// The control should start off valid, pristine, and untouched.
expect(slideToggleControl.valid).toBe(true);
expect(slideToggleControl.pristine).toBe(true);
Expand All @@ -269,7 +275,7 @@ describe('MdSlideToggle', () => {
expect(slideToggleControl.touched).toBe(true);
});

it('should not set the ngControl to touched when changing the state programmatically', () => {
it('should not set the control to touched when changing the state programmatically', () => {
// The control should start off with being untouched.
expect(slideToggleControl.touched).toBe(false);

Expand All @@ -288,7 +294,7 @@ describe('MdSlideToggle', () => {
expect(slideToggleElement.classList).not.toContain('md-checked');
});

it('should not set the ngControl to touched when changing the model', () => {
it('should not set the control to touched when changing the model', () => {
// The control should start off with being untouched.
expect(slideToggleControl.touched).toBe(false);

Expand Down
2 changes: 1 addition & 1 deletion src/components/slide-toggle/slide-toggle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/demo-app/checkbox/checkbox-demo.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h1>md-checkbox: Basic Example</h1>
<form>
<md-checkbox [(ngModel)]="isChecked"
ngControl="cb"
name="cb"
(change)="isIndeterminate = false"
[indeterminate]="isIndeterminate"
[disabled]="isDisabled"
Expand Down
3 changes: 2 additions & 1 deletion src/demo-app/checkbox/checkbox-demo.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion src/demo-app/grid-list/grid-list-demo.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 2 additions & 1 deletion src/demo-app/input/input-demo.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
5 changes: 4 additions & 1 deletion src/demo-app/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
import {HTTP_PROVIDERS} from '@angular/http';
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';
Expand All @@ -15,10 +16,12 @@ import {DEMO_APP_ROUTE_PROVIDER} from './demo-app/routes';

bootstrap(DemoApp, [
DEMO_APP_ROUTE_PROVIDER,
disableDeprecatedForms(),
provideForms(),
MdLiveAnnouncer,
provide(OVERLAY_CONTAINER_TOKEN, {useValue: createOverlayContainer()}),
HTTP_PROVIDERS,
MdIconRegistry,
Renderer,
provide(HAMMER_GESTURE_CONFIG, {useClass: MdGestureConfig})
provide(HAMMER_GESTURE_CONFIG, {useClass: MdGestureConfig}),
]);
3 changes: 2 additions & 1 deletion src/demo-app/radio/radio-demo.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/demo-app/slide-toggle/slide-toggle-demo.ts
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
1 change: 1 addition & 0 deletions src/demo-app/system-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const barrels: string[] = [
'@angular/common',
'@angular/compiler',
'@angular/http',
'@angular/forms',
'@angular/router',
'@angular/platform-browser',
'@angular/platform-browser-dynamic',
Expand Down
3 changes: 2 additions & 1 deletion src/demo-app/tabs/tab-group-demo.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Loading