Skip to content

Commit 6dc0e8a

Browse files
committed
ugh more breaking changes
1 parent db0fa3d commit 6dc0e8a

File tree

8 files changed

+27
-27
lines changed

8 files changed

+27
-27
lines changed

package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
"dependencies": {
2828
"angular2": "2.0.0-beta.17",
2929

30-
"@angular/common": "0.0.0-3",
31-
"@angular/compiler": "0.0.0-3",
32-
"@angular/core": "0.0.0-3",
33-
"@angular/router": "0.0.0-0",
34-
"@angular/http": "0.0.0-3",
35-
"@angular/platform-browser": "0.0.0-3",
36-
"@angular/platform-browser-dynamic": "0.0.0-3",
30+
"@angular/common": "0.0.0-4",
31+
"@angular/compiler": "0.0.0-4",
32+
"@angular/core": "0.0.0-4",
33+
"@angular/router": "0.0.0-4",
34+
"@angular/http": "0.0.0-4",
35+
"@angular/platform-browser": "0.0.0-4",
36+
"@angular/platform-browser-dynamic": "0.0.0-4",
3737

3838
"es6-promise": "^3.0.2",
3939
"es6-shim": "^0.35.0",

src/components/checkbox/checkbox.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {PromiseCompleter} from '../../core/async/promise-completer';
1717

1818
describe('MdCheckbox', () => {
1919
let builder: TestComponentBuilder;
20-
let fixture: ComponentFixture;
20+
let fixture: ComponentFixture<any>;
2121

2222
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
2323
builder = tcb;

src/components/sidenav/sidenav.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@ function fakeAsyncAdaptor(fn: () => void) {
2929
* Create a ComponentFixture from the builder. This takes a template and a style for sidenav.
3030
*/
3131
function createFixture(appType: Type, builder: TestComponentBuilder,
32-
template: string, style: string): ComponentFixture {
33-
let fixture: ComponentFixture = null;
32+
template: string, style: string): ComponentFixture<any> {
33+
let fixture: ComponentFixture<any> = null;
3434
// Remove the styles (which remove the animations/transitions).
3535
builder
3636
.overrideView(MdSidenavLayout, new ViewMetadata({
3737
template: template,
3838
styles: [style],
3939
directives: [MdSidenav],
4040
}))
41-
.createAsync(appType).then((f: ComponentFixture) => { fixture = f; });
41+
.createAsync(appType).then((f: ComponentFixture<any>) => { fixture = f; });
4242
tick();
4343

4444
return fixture;
4545
}
4646

4747

48-
function endSidenavTransition(fixture: ComponentFixture) {
48+
function endSidenavTransition(fixture: ComponentFixture<any>) {
4949
let sidenav: any = fixture.debugElement.query(By.directive(MdSidenav)).componentInstance;
5050
sidenav.onTransitionEnd({
5151
target: (<any>sidenav)._elementRef.nativeElement,

src/core/live-announcer/live-announcer.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export function main() {
3737
});
3838

3939
it('should correctly update the announce text', fakeAsyncTest(() => {
40-
let appFixture: ComponentFixture = null;
40+
let appFixture: ComponentFixture<TestApp> = null;
4141

4242
builder.createAsync(TestApp).then(fixture => {
4343
appFixture = fixture;
@@ -57,7 +57,7 @@ export function main() {
5757
}));
5858

5959
it('should correctly update the politeness attribute', fakeAsyncTest(() => {
60-
let appFixture: ComponentFixture = null;
60+
let appFixture: ComponentFixture<TestApp> = null;
6161

6262
builder.createAsync(TestApp).then(fixture => {
6363
appFixture = fixture;
@@ -75,7 +75,7 @@ export function main() {
7575
}));
7676

7777
it('should apply the aria-live value polite by default', fakeAsyncTest(() => {
78-
let appFixture: ComponentFixture = null;
78+
let appFixture: ComponentFixture<TestApp> = null;
7979

8080
builder.createAsync(TestApp).then(fixture => {
8181
appFixture = fixture;

src/core/portal/dom-portal-host.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class DomPortalHost extends BasePortalHost {
1717
}
1818

1919
/** Attach the given ComponentPortal to DOM element using the DynamicComponentLoader. */
20-
attachComponentPortal(portal: ComponentPortal): Promise<ComponentRef> {
20+
attachComponentPortal(portal: ComponentPortal): Promise<ComponentRef<any>> {
2121
if (portal.viewContainerRef == null) {
2222
throw new MdComponentPortalAttachedToDomWithoutOriginError();
2323
}

src/core/portal/portal-directives.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class PortalHostDirective extends BasePortalHost {
5959
}
6060

6161
/** Attach the given ComponentPortal to this PortlHost using the DynamicComponentLoader. */
62-
attachComponentPortal(portal: ComponentPortal): Promise<ComponentRef> {
62+
attachComponentPortal(portal: ComponentPortal): Promise<ComponentRef<any>> {
6363
portal.setAttachedHost(this);
6464

6565
// If the portal specifies an origin, use that as the logical location of the component

src/core/portal/portal.spec.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function main() {
2828

2929
describe('PortalHostDirective', () => {
3030
it('should load a component into the portal', fakeAsync(() => {
31-
let appFixture: ComponentFixture;
31+
let appFixture: ComponentFixture<PortalTestApp>;
3232

3333
builder.createAsync(PortalTestApp).then(fixture => {
3434
appFixture = fixture;
@@ -51,7 +51,7 @@ export function main() {
5151
}));
5252

5353
it('should load a <template> portal', fakeAsync(() => {
54-
let appFixture: ComponentFixture;
54+
let appFixture: ComponentFixture<PortalTestApp>;
5555

5656
builder.createAsync(PortalTestApp).then(fixture => {
5757
appFixture = fixture;
@@ -78,7 +78,7 @@ export function main() {
7878
}));
7979

8080
it('should load a <template> portal with the `*` sugar', fakeAsync(() => {
81-
let appFixture: ComponentFixture;
81+
let appFixture: ComponentFixture<PortalTestApp>;
8282

8383
builder.createAsync(PortalTestApp).then(fixture => {
8484
appFixture = fixture;
@@ -105,7 +105,7 @@ export function main() {
105105
}));
106106

107107
it('should load a <template> portal with a binding', fakeAsync(() => {
108-
let appFixture: ComponentFixture;
108+
let appFixture: ComponentFixture<PortalTestApp>;
109109

110110
builder.createAsync(PortalTestApp).then(fixture => {
111111
appFixture = fixture;
@@ -143,7 +143,7 @@ export function main() {
143143
}));
144144

145145
it('should change the attached portal', fakeAsync(() => {
146-
let appFixture: ComponentFixture;
146+
let appFixture: ComponentFixture<PortalTestApp>;
147147

148148
builder.createAsync(PortalTestApp).then(fixture => {
149149
appFixture = fixture;
@@ -219,7 +219,7 @@ export function main() {
219219
}));
220220

221221
it('should attach and detach a template portal', fakeAsync(() => {
222-
let appFixture: ComponentFixture;
222+
let appFixture: ComponentFixture<PortalTestApp>;
223223

224224
builder.createAsync(PortalTestApp).then(fixture => {
225225
appFixture = fixture;
@@ -236,7 +236,7 @@ export function main() {
236236
}));
237237

238238
it('should attach and detach a template portal with a binding', fakeAsync(() => {
239-
let appFixture: ComponentFixture;
239+
let appFixture: ComponentFixture<PortalTestApp>;
240240
builder.createAsync(PortalTestApp).then(fixture => {
241241
appFixture = fixture;
242242
});
@@ -281,7 +281,7 @@ export function main() {
281281

282282
flushMicrotasks();
283283

284-
let appFixture: ComponentFixture;
284+
let appFixture: ComponentFixture<PortalTestApp>;
285285

286286
builder.createAsync(PortalTestApp).then(fixture => {
287287
appFixture = fixture;

src/core/portal/portal.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export abstract class Portal<T> {
6262
/**
6363
* A `ComponentPortal` is a portal that instantiates some Component upon attachment.
6464
*/
65-
export class ComponentPortal extends Portal<ComponentRef> {
65+
export class ComponentPortal extends Portal<ComponentRef<any>> {
6666
/** The type of the component that will be instantiated for attachment. */
6767
public component: Type;
6868

@@ -178,7 +178,7 @@ export abstract class BasePortalHost implements PortalHost {
178178
throw new MdUnknownPortalTypeErron();
179179
}
180180

181-
abstract attachComponentPortal(portal: ComponentPortal): Promise<ComponentRef>;
181+
abstract attachComponentPortal(portal: ComponentPortal): Promise<ComponentRef<any>>;
182182

183183
abstract attachTemplatePortal(portal: TemplatePortal): Promise<Map<string, any>>;
184184

0 commit comments

Comments
 (0)