Skip to content

Commit b7b5faa

Browse files
committed
fix(forms): update packages to use new forms module
1 parent 04bdd16 commit b7b5faa

24 files changed

+40
-23
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"@angular/platform-browser": "2.0.0-rc.1",
3636
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
3737
"@angular/router": "2.0.0-rc.1",
38+
"@angular/forms": "^0.1.0",
3839
"core-js": "^2.4.0",
3940
"hammerjs": "^2.0.8",
4041
"rxjs": "5.0.0-beta.6",

src/components/button-toggle/button-toggle.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
tick,
1010
} from '@angular/core/testing';
1111
// TODO(iveysaur): Update to @angular/forms when we have rc.2
12-
import {NgControl} from '@angular/common';
12+
import {NgControl} from '@angular/forms';
1313
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
1414
import {Component, DebugElement, provide} from '@angular/core';
1515
import {By} from '@angular/platform-browser';

src/components/button-toggle/button-toggle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
import {
1818
NG_VALUE_ACCESSOR,
1919
ControlValueAccessor,
20-
} from '@angular/common';
20+
} from '@angular/forms';
2121
import {Observable} from 'rxjs/Observable';
2222
import {
2323
MdUniqueSelectionDispatcher

src/components/checkbox/checkbox.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
flushMicrotasks,
88
tick
99
} from '@angular/core/testing';
10-
import {FORM_DIRECTIVES, NgModel, NgControl} from '@angular/common';
10+
import {FORM_DIRECTIVES, NgModel, NgControl} from '@angular/forms';
1111
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
1212
import {Component, DebugElement} from '@angular/core';
1313
import {By} from '@angular/platform-browser';

src/components/checkbox/checkbox.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
forwardRef,
1212
AfterContentInit
1313
} from '@angular/core';
14-
import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/common';
14+
import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
1515

1616
/**
1717
* Monotonically increasing integer used to auto-generate unique ids for checkbox components.

src/components/checkbox/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
},
2222
"homepage": "https://github.com/angular/material2#readme",
2323
"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"
2526
}
2627
}

src/components/input/input.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import {
2020
NG_VALUE_ACCESSOR,
2121
ControlValueAccessor,
2222
NgModel,
23-
NgIf,
24-
} from '@angular/common';
23+
} from '@angular/forms';
24+
import {NgIf} from '@angular/common';
2525
import {BooleanFieldValue} from '@angular2-material/core/annotations/field-value';
2626
import {MdError} from '@angular2-material/core/errors/error';
2727
import {Observable} from 'rxjs/Observable';

src/components/input/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
},
2424
"homepage": "https://github.com/angular/material2#readme",
2525
"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"
2728
}
2829
}

src/components/radio/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
},
2222
"homepage": "https://github.com/angular/material2#readme",
2323
"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"
2526
}
2627
}

src/components/radio/radio.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
fakeAsync,
99
tick
1010
} from '@angular/core/testing';
11-
import {FORM_DIRECTIVES, NgControl} from '@angular/common';
11+
import {FORM_DIRECTIVES, NgControl} from '@angular/forms';
1212
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
1313
import {Component, DebugElement, provide} from '@angular/core';
1414
import {By} from '@angular/platform-browser';

0 commit comments

Comments
 (0)