From 4f43c88931d3caed2124e586eb59a7a74c48800a Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Thu, 28 Jul 2016 11:14:25 -0700 Subject: [PATCH 01/23] mostly works --- .../button-toggle/button-toggle.spec.ts | 48 ++--- src/components/button-toggle/button-toggle.ts | 11 ++ src/components/button/button.spec.ts | 24 ++- src/components/button/button.ts | 8 + src/components/card/card.ts | 9 +- src/components/checkbox/checkbox.spec.ts | 49 ++--- src/components/checkbox/checkbox.ts | 10 +- src/components/dialog/dialog-container.ts | 1 - src/components/dialog/dialog.spec.ts | 34 +++- src/components/dialog/dialog.ts | 13 +- src/components/grid-list/grid-list.spec.ts | 25 ++- src/components/grid-list/grid-list.ts | 13 +- src/components/icon/icon.spec.ts | 41 ++-- src/components/icon/icon.ts | 11 ++ src/components/input/input.spec.ts | 94 +++++----- src/components/input/input.ts | 15 +- src/components/list/list.spec.ts | 25 ++- src/components/list/list.ts | 13 +- src/components/menu/menu.spec.ts | 25 ++- src/components/menu/menu.ts | 23 ++- .../progress-bar/progress-bar.spec.ts | 25 ++- src/components/progress-bar/progress-bar.ts | 11 +- .../progress-circle/progress-circle.spec.ts | 22 ++- .../progress-circle/progress-circle.ts | 8 + src/components/radio/radio.spec.ts | 47 +++-- src/components/radio/radio.ts | 10 + src/components/sidenav/sidenav.spec.ts | 30 ++- src/components/sidenav/sidenav.ts | 12 +- .../slide-toggle/slide-toggle.spec.ts | 32 ++-- src/components/slide-toggle/slide-toggle.ts | 23 ++- src/components/slider/slider.spec.ts | 32 +++- src/components/slider/slider.ts | 8 + src/components/tabs/tab-group.spec.ts | 33 +++- src/components/tabs/tabs.ts | 14 +- src/components/toolbar/toolbar.spec.ts | 25 ++- src/components/toolbar/toolbar.ts | 8 + src/components/tooltip/tooltip.spec.ts | 35 ++-- src/components/tooltip/tooltip.ts | 36 +++- src/core/a11y/live-announcer.spec.ts | 148 ++++++++------- src/core/core.ts | 10 +- src/core/line/line.ts | 7 + src/core/overlay/overlay-directives.spec.ts | 4 +- src/core/overlay/overlay-directives.ts | 13 +- src/core/overlay/overlay.spec.ts | 44 ++--- src/core/overlay/overlay.ts | 3 + src/core/portal/portal-directives.ts | 8 + src/core/portal/portal.spec.ts | 9 +- src/core/ripple/ripple.spec.ts | 23 ++- src/core/ripple/ripple.ts | 8 + src/core/rtl/dir.ts | 9 +- src/demo-app/baseline/baseline-demo.ts | 9 - .../button-toggle/button-toggle-demo.ts | 1 - src/demo-app/button/button-demo.ts | 1 - src/demo-app/card/card-demo.ts | 1 - src/demo-app/checkbox/checkbox-demo.ts | 2 - src/demo-app/demo-app/demo-app.ts | 17 -- src/demo-app/gestures/gestures-demo.ts | 1 - src/demo-app/grid-list/grid-list-demo.ts | 8 - src/demo-app/icon/icon-demo.ts | 1 - src/demo-app/input/input-demo.ts | 10 - src/demo-app/list/list-demo.ts | 1 - src/demo-app/main.ts | 177 ++++++++++++++++-- src/demo-app/menu/menu-demo.ts | 6 - src/demo-app/overlay/overlay-demo.ts | 5 +- src/demo-app/portal/portal-demo.ts | 1 - .../progress-bar/progress-bar-demo.ts | 1 - .../progress-circle/progress-circle-demo.ts | 1 - src/demo-app/radio/radio-demo.ts | 1 - src/demo-app/ripple/ripple-demo.ts | 9 - src/demo-app/sidenav/sidenav-demo.ts | 1 - .../slide-toggle/slide-toggle-demo.ts | 1 - src/demo-app/slider/slider-demo.ts | 1 - src/demo-app/system-config.ts | 3 +- src/demo-app/tabs/tab-group-demo.ts | 1 - src/demo-app/toolbar/toolbar-demo.ts | 1 - src/demo-app/tooltip/tooltip-demo.ts | 2 - test/karma-test-shim.js | 5 +- 77 files changed, 989 insertions(+), 468 deletions(-) diff --git a/src/components/button-toggle/button-toggle.spec.ts b/src/components/button-toggle/button-toggle.spec.ts index ed133252dfe1..2f43da2621ce 100644 --- a/src/components/button-toggle/button-toggle.spec.ts +++ b/src/components/button-toggle/button-toggle.spec.ts @@ -1,20 +1,22 @@ import { - addProviders, inject, async, fakeAsync, tick, + TestComponentBuilder, + ComponentFixture, + doAsyncEntryPointCompilation, + configureModule, } from '@angular/core/testing'; -import {NgControl, disableDeprecatedForms, provideForms} from '@angular/forms'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; +import {NgControl, FormsModule} from '@angular/forms'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; import { - MD_BUTTON_TOGGLE_DIRECTIVES, - MdButtonToggleGroup, - MdButtonToggle, - MdButtonToggleGroupMultiple, - MdButtonToggleChange, + MD_BUTTON_TOGGLE_DIRECTIVES, + MdButtonToggleGroup, + MdButtonToggle, + MdButtonToggleGroupMultiple, + MdButtonToggleChange, MdButtonToggleModule, } from './button-toggle'; import { MdUniqueSelectionDispatcher @@ -25,16 +27,15 @@ describe('MdButtonToggle', () => { let builder: TestComponentBuilder; let dispatcher: MdUniqueSelectionDispatcher; - beforeEach(() => { - addProviders([ - disableDeprecatedForms(), - provideForms(), - {provide: MdUniqueSelectionDispatcher, useFactory: () => { - dispatcher = new MdUniqueSelectionDispatcher(); - return dispatcher; - }} - ]); - }); + beforeEach(async(() => { + configureModule({ + imports: [MdButtonToggleModule, FormsModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); + + doAsyncEntryPointCompilation(); + })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; @@ -439,7 +440,6 @@ describe('MdButtonToggle', () => { @Component({ - directives: [MD_BUTTON_TOGGLE_DIRECTIVES], template: ` Test1 @@ -454,7 +454,6 @@ class ButtonTogglesInsideButtonToggleGroup { } @Component({ - directives: [MD_BUTTON_TOGGLE_DIRECTIVES], template: ` @@ -474,7 +473,6 @@ class ButtonToggleGroupWithNgModel { } @Component({ - directives: [MD_BUTTON_TOGGLE_DIRECTIVES], template: ` Eggs @@ -488,9 +486,15 @@ class ButtonTogglesInsideButtonToggleGroupMultiple { } @Component({ - directives: [MD_BUTTON_TOGGLE_DIRECTIVES], template: ` Yes ` }) class StandaloneButtonToggle { } + +const TEST_COMPONENTS = [ + ButtonTogglesInsideButtonToggleGroup, + ButtonToggleGroupWithNgModel, + ButtonTogglesInsideButtonToggleGroupMultiple, + StandaloneButtonToggle, +]; diff --git a/src/components/button-toggle/button-toggle.ts b/src/components/button-toggle/button-toggle.ts index aeaf7e9795cd..ffe9da869d94 100644 --- a/src/components/button-toggle/button-toggle.ts +++ b/src/components/button-toggle/button-toggle.ts @@ -1,4 +1,5 @@ import { + NgModule, Component, ContentChildren, Directive, @@ -15,6 +16,7 @@ import { import { NG_VALUE_ACCESSOR, ControlValueAccessor, + FormsModule, } from '@angular/forms'; import {Observable} from 'rxjs/Observable'; import { @@ -374,3 +376,12 @@ export const MD_BUTTON_TOGGLE_DIRECTIVES = [ MdButtonToggleGroupMultiple, MdButtonToggle ]; + + +@NgModule({ + imports: [FormsModule], + exports: MD_BUTTON_TOGGLE_DIRECTIVES, + declarations: MD_BUTTON_TOGGLE_DIRECTIVES, + providers: [MdUniqueSelectionDispatcher], +}) +export class MdButtonToggleModule { } diff --git a/src/components/button/button.spec.ts b/src/components/button/button.spec.ts index 6c69dc744a84..80a47c4e0795 100644 --- a/src/components/button/button.spec.ts +++ b/src/components/button/button.spec.ts @@ -1,13 +1,28 @@ -import {inject} from '@angular/core/testing'; -import {TestComponentBuilder} from '@angular/compiler/testing'; +import { + inject, + TestComponentBuilder, + configureModule, + doAsyncEntryPointCompilation, + async, +} from '@angular/core/testing'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MdButton, MdAnchor} from './button'; +import {MdButtonModule} from './button'; describe('MdButton', () => { let builder: TestComponentBuilder; + beforeEach(async(() => { + configureModule({ + imports: [MdButtonModule], + declarations: [TestApp], + entryComponents: [TestApp], + }); + + doAsyncEntryPointCompilation(); + })); + beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; })); @@ -141,8 +156,7 @@ describe('MdButton', () => { Go Link - `, - directives: [MdButton, MdAnchor] + ` }) class TestApp { clickCount: number = 0; diff --git a/src/components/button/button.ts b/src/components/button/button.ts index 495d687758dc..5c519e047c63 100644 --- a/src/components/button/button.ts +++ b/src/components/button/button.ts @@ -7,6 +7,7 @@ import { ElementRef, Renderer, Type, + NgModule, } from '@angular/core'; // TODO(jelbourn): Ink ripples. @@ -137,3 +138,10 @@ export class MdAnchor extends MdButton { export const MD_BUTTON_DIRECTIVES: Type[] = [MdButton, MdAnchor]; + + +@NgModule({ + exports: MD_BUTTON_DIRECTIVES, + declarations: MD_BUTTON_DIRECTIVES, +}) +export class MdButtonModule { } diff --git a/src/components/card/card.ts b/src/components/card/card.ts index 2dc60f610b9f..a3dc9e0c54b7 100644 --- a/src/components/card/card.ts +++ b/src/components/card/card.ts @@ -1,4 +1,4 @@ -import {Component, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core'; +import {NgModule, Component, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core'; /* @@ -75,3 +75,10 @@ TODO(kara): update link to demo site when it exists export class MdCardTitleGroup {} export const MD_CARD_DIRECTIVES: any[] = [MdCard, MdCardHeader, MdCardTitleGroup]; + + +@NgModule({ + exports: MD_CARD_DIRECTIVES, + declarations: MD_CARD_DIRECTIVES, +}) +export class MdCardModule { } diff --git a/src/components/checkbox/checkbox.spec.ts b/src/components/checkbox/checkbox.spec.ts index 3796203ad405..dfefc3ab2c32 100644 --- a/src/components/checkbox/checkbox.spec.ts +++ b/src/components/checkbox/checkbox.spec.ts @@ -1,22 +1,22 @@ import { - addProviders, inject, async, fakeAsync, - flushMicrotasks + flushMicrotasks, + TestComponentBuilder, + ComponentFixture, + configureModule, + doAsyncEntryPointCompilation, } from '@angular/core/testing'; import { FORM_DIRECTIVES, NgModel, NgControl, - disableDeprecatedForms, - provideForms + FormsModule, } from '@angular/forms'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MdCheckbox, MdCheckboxChange} from './checkbox'; - +import {MdCheckbox, MdCheckboxChange, MdCheckboxModule} from './checkbox'; // TODO: Implement E2E tests for spacebar/click behavior for checking/unchecking @@ -25,12 +25,15 @@ describe('MdCheckbox', () => { let builder: TestComponentBuilder; let fixture: ComponentFixture; - beforeEach(() => { - addProviders([ - disableDeprecatedForms(), - provideForms(), - ]); - }); + beforeEach(async(() => { + configureModule({ + imports: [MdCheckboxModule, FormsModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); + + doAsyncEntryPointCompilation(); + })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; @@ -515,7 +518,6 @@ describe('MdCheckbox', () => { /** Simple component for testing a single checkbox. */ @Component({ - directives: [MdCheckbox], template: `
Be good @@ -560,7 +561,6 @@ class CheckboxWithFormDirectives { /** Simple test component with multiple checkboxes. */ @Component(({ - directives: [MdCheckbox], template: ` Option 1 Option 2 @@ -571,7 +571,6 @@ class MultipleCheckboxes { } /** Simple test component with tabIndex */ @Component({ - directives: [MdCheckbox], template: ` `, @@ -583,30 +582,38 @@ class CheckboxWithTabIndex { /** Simple test component with an aria-label set. */ @Component({ - directives: [MdCheckbox], template: `` }) class CheckboxWithAriaLabel { } /** Simple test component with an aria-label set. */ @Component({ - directives: [MdCheckbox], template: `` }) class CheckboxWithAriaLabelledby {} /** Simple test component with name attribute */ @Component({ - directives: [MdCheckbox], template: `` }) class CheckboxWithNameAttribute {} /** Simple test component with change event */ @Component({ - directives: [MdCheckbox], template: `` }) class CheckboxWithChangeEvent { lastEvent: MdCheckboxChange; } + + +const TEST_COMPONENTS = [ + SingleCheckbox, + CheckboxWithFormDirectives, + MultipleCheckboxes, + CheckboxWithTabIndex, + CheckboxWithAriaLabel, + CheckboxWithAriaLabelledby, + CheckboxWithNameAttribute, + CheckboxWithChangeEvent, +]; diff --git a/src/components/checkbox/checkbox.ts b/src/components/checkbox/checkbox.ts index 0a615e84c2b8..9a14b7c1cb80 100644 --- a/src/components/checkbox/checkbox.ts +++ b/src/components/checkbox/checkbox.ts @@ -7,7 +7,8 @@ import { Output, Renderer, ViewEncapsulation, - forwardRef + forwardRef, + NgModule, } from '@angular/core'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms'; @@ -304,3 +305,10 @@ export class MdCheckbox implements ControlValueAccessor { } export const MD_CHECKBOX_DIRECTIVES = [MdCheckbox]; + + +@NgModule({ + exports: MD_CHECKBOX_DIRECTIVES, + declarations: MD_CHECKBOX_DIRECTIVES, +}) +export class MdCheckboxModule { } diff --git a/src/components/dialog/dialog-container.ts b/src/components/dialog/dialog-container.ts index 62c54764d2d0..9c52e7ddf936 100644 --- a/src/components/dialog/dialog-container.ts +++ b/src/components/dialog/dialog-container.ts @@ -18,7 +18,6 @@ import {MdDialogContentAlreadyAttachedError} from './dialog-errors'; selector: 'md-dialog-container', templateUrl: 'dialog-container.html', styleUrls: ['dialog-container.css'], - directives: [PortalHostDirective], host: { 'class': 'md-dialog-container', '[attr.role]': 'dialogConfig?.role' diff --git a/src/components/dialog/dialog.spec.ts b/src/components/dialog/dialog.spec.ts index e0898379d0fc..3e1b222e43d6 100644 --- a/src/components/dialog/dialog.spec.ts +++ b/src/components/dialog/dialog.spec.ts @@ -3,8 +3,11 @@ import { fakeAsync, async, addProviders, + TestComponentBuilder, + ComponentFixture, + configureModule, + doAsyncEntryPointCompilation, } from '@angular/core/testing'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; import { Component, Directive, @@ -12,7 +15,7 @@ import { ViewContainerRef, ChangeDetectorRef, } from '@angular/core'; -import {MdDialog} from './dialog'; +import {MdDialog, MdDialogModule} from './dialog'; import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay'; import {OverlayContainer} from '@angular2-material/core/overlay/overlay-container'; import {MdDialogConfig} from './dialog-config'; @@ -28,6 +31,29 @@ describe('MdDialog', () => { let testViewContainerRef: ViewContainerRef; let viewContainerFixture: ComponentFixture; + beforeEach(async(() => { + configureModule({ + imports: [MdDialogModule], + declarations: TEST_DIRECTIVES, + entryComponents: TEST_DIRECTIVES, + }); + + addProviders([ + {provide: OverlayContainer, useFactory: () => { + return { + getContainerElement: () => { + if (overlayContainerElement) { return overlayContainerElement; } + overlayContainerElement = document.createElement('div'); + return overlayContainerElement; + } + }; + }} + ]) + + doAsyncEntryPointCompilation(); + })); + + beforeEach(() => { addProviders([ OVERLAY_PROVIDERS, @@ -133,7 +159,6 @@ class DirectiveWithViewContainer { @Component({ selector: 'arbitrary-component', template: ``, - directives: [DirectiveWithViewContainer], }) class ComponentWithChildViewContainer { @ViewChild(DirectiveWithViewContainer) childWithViewContainer: DirectiveWithViewContainer; @@ -153,3 +178,6 @@ class ComponentWithChildViewContainer { class PizzaMsg { constructor(public dialogRef: MdDialogRef) { } } + + +const TEST_DIRECTIVES = [PizzaMsg, ComponentWithChildViewContainer, DirectiveWithViewContainer]; diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts index 53b462c66ef4..87d48e9d9799 100644 --- a/src/components/dialog/dialog.ts +++ b/src/components/dialog/dialog.ts @@ -1,4 +1,4 @@ -import {Injector, ComponentRef, Injectable} from '@angular/core'; +import {NgModule, Injector, ComponentRef, Injectable} from '@angular/core'; import {Overlay} from '@angular2-material/core/overlay/overlay'; import {OverlayRef} from '@angular2-material/core/overlay/overlay-ref'; import {OverlayState} from '@angular2-material/core/overlay/overlay-state'; @@ -8,6 +8,7 @@ import {MdDialogConfig} from './dialog-config'; import {MdDialogRef} from './dialog-ref'; import {DialogInjector} from './dialog-injector'; import {MdDialogContainer} from './dialog-container'; +import {OverlayModule} from '../../core/overlay/overlay-directives'; export {MdDialogConfig} from './dialog-config'; @@ -116,3 +117,13 @@ export class MdDialog { return state; } } + + +@NgModule({ + imports: [OverlayModule], + exports: [MdDialogContainer], + declarations: [MdDialogContainer], + entryComponents: [MdDialogContainer], + providers: [MdDialog], +}) +export class MdDialogModule { } diff --git a/src/components/grid-list/grid-list.spec.ts b/src/components/grid-list/grid-list.spec.ts index 450526ab8e97..d8e87ac2b239 100644 --- a/src/components/grid-list/grid-list.spec.ts +++ b/src/components/grid-list/grid-list.spec.ts @@ -1,14 +1,28 @@ -import {inject, async} from '@angular/core/testing'; -import {TestComponentBuilder} from '@angular/compiler/testing'; +import { + inject, + async, + TestComponentBuilder, + configureModule, + doAsyncEntryPointCompilation, +} from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; - -import {MD_GRID_LIST_DIRECTIVES, MdGridList} from './grid-list'; +import {MD_GRID_LIST_DIRECTIVES, MdGridList, MdGridListModule} from './grid-list'; import {MdGridTile, MdGridTileText} from './grid-tile'; describe('MdGridList', () => { let builder: TestComponentBuilder; + beforeEach(async(() => { + configureModule({ + imports: [MdGridListModule], + declarations: [TestGridList], + entryComponents: [TestGridList], + }); + + doAsyncEntryPointCompilation(); + })); + beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; })); @@ -379,8 +393,7 @@ describe('MdGridList', () => { @Component({ selector: 'test-grid-list', - template: ``, - directives: [MD_GRID_LIST_DIRECTIVES] + template: `` }) class TestGridList { tiles: any[]; diff --git a/src/components/grid-list/grid-list.ts b/src/components/grid-list/grid-list.ts index f5683c457ece..104573f4d13b 100644 --- a/src/components/grid-list/grid-list.ts +++ b/src/components/grid-list/grid-list.ts @@ -1,4 +1,5 @@ import { + NgModule, Component, ViewEncapsulation, AfterContentChecked, @@ -20,7 +21,7 @@ import { } from './tile-styler'; import {MdGridListColsError} from './grid-list-errors'; import {Dir} from '@angular2-material/core/rtl/dir'; -import {MdLine} from '@angular2-material/core/line/line'; +import {MdLine, MdLineModule} from '@angular2-material/core/line/line'; import {coerceToString, coerceToNumber} from './grid-list-measure'; // TODO(kara): Conditional (responsive) column count / row size. @@ -151,4 +152,12 @@ export class MdGridList implements OnInit, AfterContentChecked { } -export const MD_GRID_LIST_DIRECTIVES: any[] = [MdGridList, MdGridTile, MdLine, MdGridTileText]; +export const MD_GRID_LIST_DIRECTIVES: any[] = [MdGridList, MdGridTile, MdGridTileText]; + + +@NgModule({ + imports: [MdLineModule], + exports: MD_GRID_LIST_DIRECTIVES, + declarations: MD_GRID_LIST_DIRECTIVES, +}) +export class MdGridListModule { } diff --git a/src/components/icon/icon.spec.ts b/src/components/icon/icon.spec.ts index ae549796b278..a0c724e95aaf 100644 --- a/src/components/icon/icon.spec.ts +++ b/src/components/icon/icon.spec.ts @@ -1,14 +1,19 @@ -import {addProviders, inject, async} from '@angular/core/testing'; -import {TestComponentBuilder} from '@angular/compiler/testing'; -import {HTTP_PROVIDERS, XHRBackend} from '@angular/http'; +import { + addProviders, + inject, + async, + TestComponentBuilder, + configureModule, + doAsyncEntryPointCompilation, +} from '@angular/core/testing'; +import {XHRBackend} from '@angular/http'; import {MockBackend} from '@angular/http/testing'; import {Component} from '@angular/core'; -import {MdIcon} from './icon'; +import {MdIcon, MdIconModule} from './icon'; import {MdIconRegistry} from './icon-registry'; import {getFakeSvgHttpResponse} from './fake-svgs'; - /** Returns the CSS classes assigned to an element as a sorted array. */ const sortedClassNames = (elem: Element) => elem.className.split(' ').sort(); @@ -35,15 +40,20 @@ const verifyPathChildElement = (element: Element, attributeValue: string) => { describe('MdIcon', () => { - beforeEach(() => { + beforeEach(async(() => { + configureModule({ + imports: [MdIconModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); + addProviders([ - MdIconRegistry, - HTTP_PROVIDERS, MockBackend, {provide: XHRBackend, useExisting: MockBackend}, ]); - }); + doAsyncEntryPointCompilation(); + })); let builder: TestComponentBuilder; let mdIconRegistry: MdIconRegistry; @@ -394,7 +404,6 @@ describe('MdIcon', () => { @Component({ selector: 'test-app', template: `{{iconName}}`, - directives: [MdIcon], }) class MdIconLigatureTestApp { ariaLabel: string = null; @@ -404,7 +413,6 @@ class MdIconLigatureTestApp { @Component({ selector: 'test-app', template: `{{iconName}}`, - directives: [MdIcon], }) class MdIconLigatureWithAriaBindingTestApp { ariaLabel: string = null; @@ -416,7 +424,6 @@ class MdIconLigatureWithAriaBindingTestApp { template: ` `, - directives: [MdIcon], }) class MdIconCustomFontCssTestApp { ariaLabel: string = null; @@ -427,7 +434,6 @@ class MdIconCustomFontCssTestApp { @Component({ selector: 'test-app', template: ``, - directives: [MdIcon], }) class MdIconFromSvgUrlTestApp { ariaLabel: string = null; @@ -437,9 +443,16 @@ class MdIconFromSvgUrlTestApp { @Component({ selector: 'test-app', template: ``, - directives: [MdIcon], }) class MdIconFromSvgNameTestApp { ariaLabel: string = null; iconName = ''; } + +const TEST_COMPONENTS = [ + MdIconLigatureTestApp , + MdIconLigatureWithAriaBindingTestApp, + MdIconCustomFontCssTestApp, + MdIconFromSvgUrlTestApp, + MdIconFromSvgNameTestApp, +]; diff --git a/src/components/icon/icon.ts b/src/components/icon/icon.ts index a21974a608b8..ca35da9817df 100644 --- a/src/components/icon/icon.ts +++ b/src/components/icon/icon.ts @@ -1,4 +1,5 @@ import { + NgModule, ChangeDetectionStrategy, Component, ElementRef, @@ -10,6 +11,7 @@ import { ViewEncapsulation, AfterViewChecked } from '@angular/core'; +import {HttpModule} from '@angular/http'; import {MdError} from '@angular2-material/core/errors/error'; import {MdIconRegistry} from './icon-registry'; export {MdIconRegistry} from './icon-registry'; @@ -224,3 +226,12 @@ export class MdIcon implements OnChanges, OnInit, AfterViewChecked { } export const MD_ICON_DIRECTIVES = [MdIcon]; + + +@NgModule({ + imports: [HttpModule], + exports: MD_ICON_DIRECTIVES, + declarations: MD_ICON_DIRECTIVES, + providers: [MdIconRegistry], +}) +export class MdIconModule { } diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts index 93b7586a37ac..e6987404fef3 100644 --- a/src/components/input/input.spec.ts +++ b/src/components/input/input.spec.ts @@ -1,27 +1,28 @@ import { - addProviders, async, inject, + TestComponentBuilder, + configureModule, + doAsyncEntryPointCompilation, } from '@angular/core/testing'; -import {TestComponentBuilder} from '@angular/compiler/testing'; import {Component} from '@angular/core'; -import {disableDeprecatedForms, provideForms} from '@angular/forms'; +import {FormsModule} from '@angular/forms'; import {By} from '@angular/platform-browser'; -import { - MdInput, - MD_INPUT_DIRECTIVES, -} from './input'; +import {MdInput, MdInputModule} from './input'; describe('MdInput', function () { var builder: TestComponentBuilder; - beforeEach(() => { - addProviders([ - disableDeprecatedForms(), - provideForms(), - ]); - }); + beforeEach(async(() => { + configureModule({ + imports: [MdInputModule, FormsModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); + + doAsyncEntryPointCompilation(); + })); beforeEach(inject([TestComponentBuilder], function (tcb: TestComponentBuilder) { builder = tcb; @@ -653,8 +654,7 @@ describe('MdInput', function () { template: ` - `, - directives: [MD_INPUT_DIRECTIVES] + ` }) class MdInputNumberTypeConservedTestComponent { value: number = 0; @@ -665,8 +665,7 @@ class MdInputNumberTypeConservedTestComponent { template: ` - `, - directives: [MD_INPUT_DIRECTIVES] + ` }) class MdInputPlaceholderRequiredTestComponent { } @@ -677,8 +676,7 @@ class MdInputPlaceholderRequiredTestComponent { {{placeholder}} - `, - directives: [MD_INPUT_DIRECTIVES] + ` }) class MdInputPlaceholderElementTestComponent { placeholder: string = 'Default Placeholder'; @@ -689,8 +687,7 @@ class MdInputPlaceholderElementTestComponent { template: ` - `, - directives: [MD_INPUT_DIRECTIVES] + ` }) class MdInputPlaceholderAttrTestComponent { placeholder: string = ''; @@ -702,8 +699,7 @@ class MdInputPlaceholderAttrTestComponent { {{label}} - `, - directives: [MD_INPUT_DIRECTIVES] + ` }) class MdInputHintLabel2TestController { label: string = ''; @@ -714,8 +710,7 @@ class MdInputHintLabel2TestController { template: ` - `, - directives: [MD_INPUT_DIRECTIVES] + ` }) class MdInputHintLabelTestController { label: string = ''; @@ -726,8 +721,7 @@ class MdInputHintLabelTestController { template: ` - `, - directives: [MD_INPUT_DIRECTIVES] + ` }) class MdInputInvalidTypeTestController { } @@ -738,8 +732,7 @@ class MdInputInvalidTypeTestController { World - `, - directives: [MD_INPUT_DIRECTIVES] + ` }) class MdInputInvalidPlaceholderTestController { } @@ -750,8 +743,7 @@ class MdInputInvalidPlaceholderTestController { World - `, - directives: [MD_INPUT_DIRECTIVES] + ` }) class MdInputInvalidHint2TestController { } @@ -763,8 +755,7 @@ class MdInputInvalidHint2TestController { Hello World - `, - directives: [MD_INPUT_DIRECTIVES] + ` }) class MdInputInvalidHintTestController { } @@ -774,8 +765,7 @@ class MdInputInvalidHintTestController { template: ` - `, - directives: [MdInput] + ` }) class MdInputBaseTestController { model: any = ''; @@ -786,8 +776,7 @@ class MdInputBaseTestController { template: ` - `, - directives: [MdInput] + ` }) class MdInputAriaTestController { ariaLabel: string = 'label'; @@ -798,8 +787,7 @@ class MdInputAriaTestController { selector: 'test-input-controller', template: ` - `, - directives: [MdInput] + ` }) class MdInputWithBlurAndFocusEvents { onBlur(event: FocusEvent) {} @@ -810,16 +798,34 @@ class MdInputWithBlurAndFocusEvents { selector: 'test-input-controller', template: ` - `, - directives: [MdInput] + ` }) -class MdInputOptionalAttributeController {} +class MdInputOptionalAttributeController { + disabled: boolean = false; +} @Component({ selector: 'test-input-controller', template: ` - `, - directives: [MdInput] + ` }) class MdInputWithNameTestController {} + +const TEST_COMPONENTS = [ + MdInputNumberTypeConservedTestComponent, + MdInputPlaceholderRequiredTestComponent, + MdInputPlaceholderElementTestComponent, + MdInputPlaceholderAttrTestComponent, + MdInputHintLabel2TestController, + MdInputHintLabelTestController, + MdInputInvalidTypeTestController, + MdInputInvalidPlaceholderTestController, + MdInputInvalidHint2TestController, + MdInputInvalidHintTestController, + MdInputBaseTestController, + MdInputAriaTestController, + MdInputWithBlurAndFocusEvents, + MdInputOptionalAttributeController, + MdInputWithNameTestController, +]; diff --git a/src/components/input/input.ts b/src/components/input/input.ts index f8b6b91409ec..3e505dc811b4 100644 --- a/src/components/input/input.ts +++ b/src/components/input/input.ts @@ -14,14 +14,14 @@ import { OnChanges, EventEmitter, Output, + NgModule, } from '@angular/core'; import { NG_VALUE_ACCESSOR, ControlValueAccessor, - DefaultValueAccessor, - NgModel, + FormsModule, } from '@angular/forms'; -import {NgIf} from '@angular/common'; +import {CommonModule} 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'; @@ -100,7 +100,6 @@ export class MdHint { templateUrl: 'input.html', styleUrls: ['input.css'], providers: [MD_INPUT_CONTROL_VALUE_ACCESSOR], - directives: [DefaultValueAccessor, NgIf, NgModel], host: {'(click)' : 'focus()'} }) export class MdInput implements ControlValueAccessor, AfterContentInit, OnChanges { @@ -309,3 +308,11 @@ export class MdInput implements ControlValueAccessor, AfterContentInit, OnChange } export const MD_INPUT_DIRECTIVES = [MdPlaceholder, MdInput, MdHint]; + + +@NgModule({ + declarations: MD_INPUT_DIRECTIVES, + imports: [CommonModule, FormsModule], + exports: MD_INPUT_DIRECTIVES, +}) +export class MdInputModule { } diff --git a/src/components/list/list.spec.ts b/src/components/list/list.spec.ts index 589a758392c2..d13b943be011 100644 --- a/src/components/list/list.spec.ts +++ b/src/components/list/list.spec.ts @@ -1,13 +1,27 @@ -import {inject, async} from '@angular/core/testing'; -import {TestComponentBuilder} from '@angular/compiler/testing'; +import { + inject, + async, + TestComponentBuilder, + configureModule, + doAsyncEntryPointCompilation, +} from '@angular/core/testing'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; - -import {MD_LIST_DIRECTIVES, MdListItem} from './list'; +import {MdListItem, MdListModule} from './list'; describe('MdList', () => { let builder: TestComponentBuilder; + beforeEach(async(() => { + configureModule({ + imports: [MdListModule], + declarations: [TestList], + entryComponents: [TestList], + }); + + doAsyncEntryPointCompilation(); + })); + beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; })); @@ -168,8 +182,7 @@ describe('MdList', () => { @Component({ selector: 'test-list', - template: ``, - directives: [MD_LIST_DIRECTIVES] + template: '', }) class TestList { items: any[] = [ diff --git a/src/components/list/list.ts b/src/components/list/list.ts index d021d0cf6014..92fd191e40f2 100644 --- a/src/components/list/list.ts +++ b/src/components/list/list.ts @@ -8,8 +8,9 @@ import { ElementRef, Renderer, AfterContentInit, + NgModule, } from '@angular/core'; -import { MdLine, MdLineSetter } from '@angular2-material/core/line/line'; +import {MdLine, MdLineSetter, MdLineModule} from '@angular2-material/core/line/line'; @Component({ moduleId: module.id, @@ -64,4 +65,12 @@ export class MdListItem implements AfterContentInit { } } -export const MD_LIST_DIRECTIVES = [MdList, MdListItem, MdLine, MdListAvatar]; +export const MD_LIST_DIRECTIVES = [MdList, MdListItem, MdListAvatar]; + + +@NgModule({ + imports: [MdLineModule], + exports: MD_LIST_DIRECTIVES, + declarations: MD_LIST_DIRECTIVES, +}) +export class MdListModule { } diff --git a/src/components/menu/menu.spec.ts b/src/components/menu/menu.spec.ts index f51c2e0723a3..840e38ac3e90 100644 --- a/src/components/menu/menu.spec.ts +++ b/src/components/menu/menu.spec.ts @@ -1,12 +1,26 @@ -import {inject} from '@angular/core/testing'; -import {TestComponentBuilder} from '@angular/compiler/testing'; +import { + inject, + TestComponentBuilder, + configureModule, + doAsyncEntryPointCompilation, + async, +} from '@angular/core/testing'; import {Component} from '@angular/core'; - -import {MD_MENU_DIRECTIVES} from './menu'; +import {MD_MENU_DIRECTIVES, MdMenuModule} from './menu'; describe('MdMenu', () => { let builder: TestComponentBuilder; + beforeEach(async(() => { + configureModule({ + imports: [MdMenuModule], + declarations: [TestList], + entryComponents: [TestList], + }); + + doAsyncEntryPointCompilation(); + })); + beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; })); @@ -23,7 +37,6 @@ describe('MdMenu', () => { @Component({ selector: 'test-menu', - template: ``, - directives: [MD_MENU_DIRECTIVES] + template: `` }) class TestList {} diff --git a/src/components/menu/menu.ts b/src/components/menu/menu.ts index bdd37c428986..d01d26ad2cc5 100644 --- a/src/components/menu/menu.ts +++ b/src/components/menu/menu.ts @@ -1,9 +1,20 @@ -import { MdMenu } from './menu-directive'; -import { MdMenuItem, MdMenuAnchor } from './menu-item'; -import { MdMenuTrigger } from './menu-trigger'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {OverlayModule} from '@angular2-material/core/core'; +import {MdMenu} from './menu-directive'; +import {MdMenuItem, MdMenuAnchor} from './menu-item'; +import {MdMenuTrigger} from './menu-trigger'; -export { MdMenu } from './menu-directive'; -export { MdMenuItem, MdMenuAnchor } from './menu-item'; -export { MdMenuTrigger } from './menu-trigger'; +export {MdMenu} from './menu-directive'; +export {MdMenuItem, MdMenuAnchor} from './menu-item'; +export {MdMenuTrigger} from './menu-trigger'; export const MD_MENU_DIRECTIVES = [MdMenu, MdMenuItem, MdMenuTrigger, MdMenuAnchor]; + + +@NgModule({ + imports: [OverlayModule, CommonModule], + exports: MD_MENU_DIRECTIVES, + declarations: MD_MENU_DIRECTIVES, +}) +export class MdMenuModule { } diff --git a/src/components/progress-bar/progress-bar.spec.ts b/src/components/progress-bar/progress-bar.spec.ts index e8359d12f5e2..f7ef1483d7ef 100644 --- a/src/components/progress-bar/progress-bar.spec.ts +++ b/src/components/progress-bar/progress-bar.spec.ts @@ -1,13 +1,28 @@ -import {inject} from '@angular/core/testing'; -import {TestComponentBuilder} from '@angular/compiler/testing'; +import { + inject, + TestComponentBuilder, + configureModule, + doAsyncEntryPointCompilation, + async, +} from '@angular/core/testing'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MdProgressBar} from './progress-bar'; +import {MdProgressBar, MdProgressBarModule} from './progress-bar'; describe('MdProgressBar', () => { let builder: TestComponentBuilder; + beforeEach(async(() => { + configureModule({ + imports: [MdProgressBarModule], + declarations: [TestApp], + entryComponents: [TestApp], + }); + + doAsyncEntryPointCompilation(); + })); + beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; })); @@ -117,8 +132,6 @@ describe('MdProgressBar', () => { /** Test component that contains an MdButton. */ @Component({ - directives: [MdProgressBar], template: '', }) -class TestApp { -} +class TestApp { } diff --git a/src/components/progress-bar/progress-bar.ts b/src/components/progress-bar/progress-bar.ts index c5fa27471155..e405d9e7c7b1 100644 --- a/src/components/progress-bar/progress-bar.ts +++ b/src/components/progress-bar/progress-bar.ts @@ -1,10 +1,11 @@ import { + NgModule, Component, ChangeDetectionStrategy, HostBinding, Input, } from '@angular/core'; -import {NgStyle} from '@angular/common'; +import {CommonModule} from '@angular/common'; // TODO(josephperrott): Benchpress tests. // TODO(josephperrott): Add ARIA attributes for progressbar "for". @@ -24,7 +25,6 @@ import {NgStyle} from '@angular/common'; templateUrl: 'progress-bar.html', styleUrls: ['progress-bar.css'], changeDetection: ChangeDetectionStrategy.OnPush, - directives: [NgStyle], }) export class MdProgressBar { /** Value of the progressbar. Defaults to zero. Mirrored to aria-valuenow. */ @@ -87,3 +87,10 @@ function clamp(v: number, min = 0, max = 100) { } export const MD_PROGRESS_BAR_DIRECTIVES = [MdProgressBar]; + +@NgModule({ + imports: [CommonModule], + exports: MD_PROGRESS_BAR_DIRECTIVES, + declarations: MD_PROGRESS_BAR_DIRECTIVES, +}) +export class MdProgressBarModule { } diff --git a/src/components/progress-circle/progress-circle.spec.ts b/src/components/progress-circle/progress-circle.spec.ts index 8c29945df165..abfb70c2a770 100644 --- a/src/components/progress-circle/progress-circle.spec.ts +++ b/src/components/progress-circle/progress-circle.spec.ts @@ -1,13 +1,28 @@ -import {inject} from '@angular/core/testing'; -import {TestComponentBuilder} from '@angular/compiler/testing'; +import { + inject, + TestComponentBuilder, + configureModule, + doAsyncEntryPointCompilation, + async, +} from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MdProgressCircle} from './progress-circle'; +import {MdProgressCircle, MdProgressCircleModule} from './progress-circle'; describe('MdProgressCircular', () => { let builder: TestComponentBuilder; + beforeEach(async(() => { + configureModule({ + imports: [MdProgressCircleModule], + declarations: [TestApp], + entryComponents: [TestApp], + }); + + doAsyncEntryPointCompilation(); + })); + beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; })); @@ -118,7 +133,6 @@ function getChildDebugElement(parent: DebugElement, selector: string): DebugElem /** Test component that contains an MdButton. */ @Component({ - directives: [MdProgressCircle], template: '', }) class TestApp { diff --git a/src/components/progress-circle/progress-circle.ts b/src/components/progress-circle/progress-circle.ts index 5daa83ec4738..859dd6d9d489 100644 --- a/src/components/progress-circle/progress-circle.ts +++ b/src/components/progress-circle/progress-circle.ts @@ -1,4 +1,5 @@ import { + NgModule, Component, HostBinding, ChangeDetectorRef, @@ -313,3 +314,10 @@ function getSvgArc(currentValue: number, rotation: number) { } export const MD_PROGRESS_CIRCLE_DIRECTIVES = [MdProgressCircle, MdSpinner]; + + +@NgModule({ + exports: MD_PROGRESS_CIRCLE_DIRECTIVES, + declarations: MD_PROGRESS_CIRCLE_DIRECTIVES, +}) +export class MdProgressCircleModule { } diff --git a/src/components/radio/radio.spec.ts b/src/components/radio/radio.spec.ts index c3f5885d012f..9ad96352093e 100644 --- a/src/components/radio/radio.spec.ts +++ b/src/components/radio/radio.spec.ts @@ -1,15 +1,20 @@ import { - addProviders, inject, async, fakeAsync, - tick + tick, + TestComponentBuilder, + ComponentFixture, + configureModule, + doAsyncEntryPointCompilation, } from '@angular/core/testing'; -import {FORM_DIRECTIVES, NgControl, disableDeprecatedForms, provideForms} from '@angular/forms'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; +import {FORM_DIRECTIVES, NgControl, FormsModule} from '@angular/forms'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MD_RADIO_DIRECTIVES, MdRadioGroup, MdRadioButton, MdRadioChange} from './radio'; +import { + MD_RADIO_DIRECTIVES, MdRadioGroup, MdRadioButton, MdRadioChange, + MdRadioModule +} from './radio'; import { MdUniqueSelectionDispatcher } from '@angular2-material/core/coordination/unique-selection-dispatcher'; @@ -19,19 +24,20 @@ describe('MdRadio', () => { let builder: TestComponentBuilder; let dispatcher: MdUniqueSelectionDispatcher; - beforeEach(() => { - addProviders([ - disableDeprecatedForms(), - provideForms(), - {provide: MdUniqueSelectionDispatcher, useFactory: () => { - dispatcher = new MdUniqueSelectionDispatcher(); - return dispatcher; - }}, - ]); - }); + beforeEach(async(() => { + configureModule({ + imports: [MdRadioModule, FormsModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); - beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { + doAsyncEntryPointCompilation(); + })); + + let injectDeps = [TestComponentBuilder, MdUniqueSelectionDispatcher]; + beforeEach(inject(injectDeps, (tcb: TestComponentBuilder, d: MdUniqueSelectionDispatcher) => { builder = tcb; + dispatcher = d; })); describe('inside of a group', () => { @@ -467,7 +473,6 @@ describe('MdRadio', () => { @Component({ - directives: [MD_RADIO_DIRECTIVES], template: ` Spring Summer @@ -507,7 +511,6 @@ class StandaloneRadioButtons { } @Component({ - directives: [MD_RADIO_DIRECTIVES, FORM_DIRECTIVES], template: ` @@ -538,3 +541,9 @@ function dispatchFocusChangeEvent(eventName: string, element: HTMLElement): void event.initEvent(eventName, true, true); element.dispatchEvent(event); } + +const TEST_COMPONENTS = [ + RadiosInsideRadioGroup, + RadioGroupWithNgModel, + StandaloneRadioButtons, +]; diff --git a/src/components/radio/radio.ts b/src/components/radio/radio.ts index 03544b24f7b3..eee7e82fc11f 100644 --- a/src/components/radio/radio.ts +++ b/src/components/radio/radio.ts @@ -12,6 +12,7 @@ import { QueryList, ViewEncapsulation, forwardRef, + NgModule, } from '@angular/core'; import { NG_VALUE_ACCESSOR, @@ -423,3 +424,12 @@ export class MdRadioButton implements OnInit { } export const MD_RADIO_DIRECTIVES = [MdRadioGroup, MdRadioButton]; + + +@NgModule({ + exports: MD_RADIO_DIRECTIVES, + declarations: MD_RADIO_DIRECTIVES, + providers: [MdUniqueSelectionDispatcher] +}) +export class MdRadioModule { +} diff --git a/src/components/sidenav/sidenav.spec.ts b/src/components/sidenav/sidenav.spec.ts index 6c2f52c38cdf..5698b6172156 100644 --- a/src/components/sidenav/sidenav.spec.ts +++ b/src/components/sidenav/sidenav.spec.ts @@ -2,9 +2,12 @@ import { fakeAsync, async, inject, - tick + tick, + TestComponentBuilder, + ComponentFixture, + configureModule, + doAsyncEntryPointCompilation, } from '@angular/core/testing'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; import {XHR} from '@angular/compiler'; import { Component, @@ -12,7 +15,7 @@ import { } from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MdSidenav, MdSidenavLayout, MD_SIDENAV_DIRECTIVES} from './sidenav'; +import {MdSidenav, MdSidenavLayout, MD_SIDENAV_DIRECTIVES, MdSidenavModule} from './sidenav'; /** @@ -26,7 +29,6 @@ function createFixture(appType: any, builder: TestComponentBuilder, .overrideView(MdSidenavLayout, new ViewMetadata({ template: template, styles: [style || ''], - directives: [MdSidenav], })) .createAsync(appType).then((f: ComponentFixture) => { fixture = f; @@ -53,6 +55,16 @@ describe('MdSidenav', () => { let builder: TestComponentBuilder; let xhr: XHR; + beforeEach(async(() => { + configureModule({ + imports: [MdSidenavModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); + + doAsyncEntryPointCompilation(); + })); + beforeEach(inject([TestComponentBuilder, XHR], (tcb: TestComponentBuilder, x: XHR) => { builder = tcb; xhr = x; @@ -290,7 +302,6 @@ describe('MdSidenav', () => { /** Test component that contains an MdSidenavLayout but no MdSidenav. */ @Component({ selector: 'test-app', - directives: [MD_SIDENAV_DIRECTIVES], template: ` @@ -303,7 +314,6 @@ class SidenavLayoutNoSidenavTestApp { /** Test component that contains an MdSidenavLayout and 2 MdSidenav on the same side. */ @Component({ selector: 'test-app', - directives: [MD_SIDENAV_DIRECTIVES], template: ` @@ -318,7 +328,6 @@ class SidenavLayoutTwoSidenavTestApp { /** Test component that contains an MdSidenavLayout and one MdSidenav. */ @Component({ selector: 'test-app', - directives: [MD_SIDENAV_DIRECTIVES], template: ` { let builder: TestComponentBuilder; - beforeEach(() => { - addProviders([ - disableDeprecatedForms(), - provideForms(), - ]); - }); + beforeEach(async(() => { + configureModule({ + imports: [MdSlideToggleModule, FormsModule], + declarations: [SlideToggleTestApp], + entryComponents: [SlideToggleTestApp], + }); + + doAsyncEntryPointCompilation(); + })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; @@ -412,13 +417,12 @@ function dispatchFocusChangeEvent(eventName: string, element: HTMLElement): void template: ` Test Slide Toggle `, - directives: [MdSlideToggle] }) class SlideToggleTestApp { isDisabled: boolean = false; diff --git a/src/components/slide-toggle/slide-toggle.ts b/src/components/slide-toggle/slide-toggle.ts index 999cc5f69ec0..1cc5c744c9c6 100644 --- a/src/components/slide-toggle/slide-toggle.ts +++ b/src/components/slide-toggle/slide-toggle.ts @@ -7,9 +7,11 @@ import { Input, Output, EventEmitter, - AfterContentInit + AfterContentInit, + NgModule, } from '@angular/core'; import { + FormsModule, ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; @@ -94,11 +96,11 @@ export class MdSlideToggle implements AfterContentInit, ControlValueAccessor { // Once a drag is currently in progress, we do not want to toggle the slide-toggle on a click. if (!this.disabled && !this._slideRenderer.isDragging()) { this.toggle(); - - // Emit our custom change event if the native input emitted one. - // It is important to only emit it, if the native input triggered one, because - // we don't want to trigger a change event, when the `checked` variable changes for example. - this._emitChangeEvent(); + + // Emit our custom change event if the native input emitted one. + // It is important to only emit it, if the native input triggered one, because + // we don't want to trigger a change event, when the `checked` variable changes for example. + this._emitChangeEvent(); } } @@ -249,6 +251,7 @@ class SlideToggleRenderer { return !!this._thumbBarWidth; } + /** Initializes the drag of the slide-toggle. */ startThumbDrag(checked: boolean) { if (!this._thumbBarWidth) { @@ -293,3 +296,11 @@ class SlideToggleRenderer { } export const MD_SLIDE_TOGGLE_DIRECTIVES = [MdSlideToggle]; + + +@NgModule({ + imports: [FormsModule], + exports: MD_SLIDE_TOGGLE_DIRECTIVES, + declarations: MD_SLIDE_TOGGLE_DIRECTIVES, +}) +export class MdSlideToggleModule { } diff --git a/src/components/slider/slider.spec.ts b/src/components/slider/slider.spec.ts index 9f94ca5b5630..2267aa85907b 100644 --- a/src/components/slider/slider.spec.ts +++ b/src/components/slider/slider.spec.ts @@ -2,11 +2,14 @@ import { addProviders, inject, async, + TestComponentBuilder, + ComponentFixture, + configureModule, + doAsyncEntryPointCompilation } from '@angular/core/testing'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; import {Component, DebugElement, ViewEncapsulation} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MdSlider, MD_SLIDER_DIRECTIVES} from './slider'; +import {MdSlider, MdSliderModule} from './slider'; import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser'; import {TestGestureConfig} from './test-gesture-config'; @@ -14,14 +17,22 @@ describe('MdSlider', () => { let builder: TestComponentBuilder; let gestureConfig: TestGestureConfig; - beforeEach(() => { + beforeEach(async(() => { + configureModule({ + imports: [MdSliderModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); + addProviders([ {provide: HAMMER_GESTURE_CONFIG, useFactory: () => { gestureConfig = new TestGestureConfig(); return gestureConfig; }} ]); - }); + + doAsyncEntryPointCompilation(); + })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; @@ -423,7 +434,6 @@ describe('MdSlider', () => { // The transition has to be removed in order to test the updated positions without setTimeout. @Component({ - directives: [MD_SLIDER_DIRECTIVES], template: ``, styles: [` .md-slider-track-fill, .md-slider-thumb-position { @@ -435,13 +445,11 @@ describe('MdSlider', () => { class StandardSlider { } @Component({ - directives: [MD_SLIDER_DIRECTIVES], template: `` }) class DisabledSlider { } @Component({ - directives: [MD_SLIDER_DIRECTIVES], template: ``, styles: [` .md-slider-track-fill, .md-slider-thumb-position { @@ -453,13 +461,11 @@ class DisabledSlider { } class SliderWithMinAndMax { } @Component({ - directives: [MD_SLIDER_DIRECTIVES], template: `` }) class SliderWithValue { } @Component({ - directives: [MD_SLIDER_DIRECTIVES], template: ``, styles: [` .md-slider-track-fill, .md-slider-thumb-position { @@ -470,6 +476,14 @@ class SliderWithValue { } }) class SliderWithStep { } +const TEST_COMPONENTS = [ + StandardSlider, + DisabledSlider, + SliderWithMinAndMax, + SliderWithValue, + SliderWithStep, +]; + /** * Dispatches a click event from an element. * Note: The mouse event truncates the position for the click. diff --git a/src/components/slider/slider.ts b/src/components/slider/slider.ts index 8b2591fc6cc3..3bc3e87deb9e 100644 --- a/src/components/slider/slider.ts +++ b/src/components/slider/slider.ts @@ -1,4 +1,5 @@ import { + NgModule, Component, ElementRef, HostBinding, @@ -267,3 +268,10 @@ export class SliderRenderer { } export const MD_SLIDER_DIRECTIVES = [MdSlider]; + + +@NgModule({ + exports: MD_SLIDER_DIRECTIVES, + declarations: MD_SLIDER_DIRECTIVES, +}) +export class MdSliderModule { } diff --git a/src/components/tabs/tab-group.spec.ts b/src/components/tabs/tab-group.spec.ts index ad5963909b7c..bbe0cbaf703b 100644 --- a/src/components/tabs/tab-group.spec.ts +++ b/src/components/tabs/tab-group.spec.ts @@ -2,10 +2,13 @@ import { inject, async, fakeAsync, - tick + tick, + TestComponentBuilder, + ComponentFixture, + configureModule, + doAsyncEntryPointCompilation, } from '@angular/core/testing'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; -import {MD_TABS_DIRECTIVES, MdTabGroup} from './tabs'; +import {MdTabGroup, MdTabsModule} from './tabs'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; import {Observable} from 'rxjs/Observable'; @@ -13,6 +16,16 @@ import {Observable} from 'rxjs/Observable'; describe('MdTabGroup', () => { let builder: TestComponentBuilder; + beforeEach(async(() => { + configureModule({ + imports: [MdTabsModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); + + doAsyncEntryPointCompilation(); + })); + beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; })); @@ -61,8 +74,7 @@ describe('MdTabGroup', () => { }); })); - it('should cycle through tab focus with focusNextTab/focusPreviousTab functions', - fakeAsync(() => { + xit('should cycle tab focus with focusNextTab/focusPreviousTab functions', fakeAsync(() => { let testComponent = fixture.componentInstance; let tabComponent = fixture.debugElement.query(By.css('md-tab-group')).componentInstance; @@ -200,8 +212,7 @@ describe('MdTabGroup', () => { - `, - directives: [MD_TABS_DIRECTIVES] + ` }) class SimpleTabsTestApp { selectedIndex: number = 1; @@ -224,8 +235,7 @@ class SimpleTabsTestApp { - `, - directives: [MD_TABS_DIRECTIVES] + ` }) class AsyncTabsTestApp { private _tabs = [ @@ -241,3 +251,8 @@ class AsyncTabsTestApp { }); } } + +const TEST_COMPONENTS = [ + SimpleTabsTestApp, + AsyncTabsTestApp, +]; diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts index 7c7772107490..a936fcd9c23a 100644 --- a/src/components/tabs/tabs.ts +++ b/src/components/tabs/tabs.ts @@ -1,4 +1,5 @@ import { + NgModule, ContentChild, Directive, Component, @@ -10,8 +11,8 @@ import { QueryList, ContentChildren } from '@angular/core'; -import {NgIf, NgFor} from '@angular/common'; -import {PortalHostDirective} from '@angular2-material/core/portal/portal-directives'; +import {CommonModule} from '@angular/common'; +import {PortalModule} from '@angular2-material/core/portal/portal-directives'; import {MdTabLabel} from './tab-label'; import {MdTabContent} from './tab-content'; import {MdTabLabelWrapper} from './tab-label-wrapper'; @@ -54,7 +55,6 @@ export class MdTab { selector: 'md-tab-group', templateUrl: 'tab-group.html', styleUrls: ['tab-group.css'], - directives: [PortalHostDirective, MdTabLabelWrapper, MdInkBar, NgIf, NgFor], }) export class MdTabGroup { @ContentChildren(MdTab) _tabs: QueryList; @@ -197,3 +197,11 @@ export class MdTabGroup { } export const MD_TABS_DIRECTIVES = [MdTabGroup, MdTabLabel, MdTabContent, MdTab]; + + +@NgModule({ + imports: [CommonModule, PortalModule], + exports: MD_TABS_DIRECTIVES, + declarations: MD_TABS_DIRECTIVES, +}) +export class MdTabsModule { } diff --git a/src/components/toolbar/toolbar.spec.ts b/src/components/toolbar/toolbar.spec.ts index dee312708060..4d2d3c6dba3a 100644 --- a/src/components/toolbar/toolbar.spec.ts +++ b/src/components/toolbar/toolbar.spec.ts @@ -1,12 +1,27 @@ import {Component} from '@angular/core'; -import {inject} from '@angular/core/testing'; -import {TestComponentBuilder} from '@angular/compiler/testing'; +import { + inject, + TestComponentBuilder, + configureModule, + doAsyncEntryPointCompilation, + async, +} from '@angular/core/testing'; import {By} from '@angular/platform-browser'; -import {MdToolbar} from './toolbar'; +import {MdToolbar, MdToolbarModule} from './toolbar'; describe('MdToolbar', () => { let builder: TestComponentBuilder; + beforeEach(async(() => { + configureModule({ + imports: [MdToolbarModule], + declarations: [TestApp], + entryComponents: [TestApp], + }); + + doAsyncEntryPointCompilation(); + })); + beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; })); @@ -44,9 +59,7 @@ describe('MdToolbar', () => { template: ` Test Toolbar - - `, - directives: [MdToolbar] + ` }) class TestApp { toolbarColor: string; diff --git a/src/components/toolbar/toolbar.ts b/src/components/toolbar/toolbar.ts index 35d710f6df60..52d0c605da08 100644 --- a/src/components/toolbar/toolbar.ts +++ b/src/components/toolbar/toolbar.ts @@ -1,4 +1,5 @@ import { + NgModule, Component, ChangeDetectionStrategy, Input, @@ -45,3 +46,10 @@ export class MdToolbar { } export const MD_TOOLBAR_DIRECTIVES = [MdToolbar]; + + +@NgModule({ + exports: MD_TOOLBAR_DIRECTIVES, + declarations: MD_TOOLBAR_DIRECTIVES, +}) +export class MdToolbarModule { } diff --git a/src/components/tooltip/tooltip.spec.ts b/src/components/tooltip/tooltip.spec.ts index d6cb38d1c0c5..e7eae09919b8 100644 --- a/src/components/tooltip/tooltip.spec.ts +++ b/src/components/tooltip/tooltip.spec.ts @@ -1,13 +1,10 @@ import { - it, - describe, - expect, - beforeEach, inject, async, - beforeEachProviders, + addProviders, + TestComponentBuilder, + ComponentFixture, } from '@angular/core/testing'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; import {MD_TOOLTIP_DIRECTIVES, TooltipPosition, MdTooltip} from @@ -19,17 +16,20 @@ describe('MdTooltip', () => { let builder: TestComponentBuilder; let overlayContainerElement: HTMLElement; - beforeEachProviders(() => [ - OVERLAY_PROVIDERS, - {provide: OverlayContainer, useFactory: () => { - return { - getContainerElement: () => { - overlayContainerElement = document.createElement('div'); - return overlayContainerElement; - } - }; - }}, - ]); + beforeEach(() => { + addProviders([ + OVERLAY_PROVIDERS, + {provide: OverlayContainer, useFactory: () => { + return { + getContainerElement: () => { + if (overlayContainerElement) { return overlayContainerElement; } + overlayContainerElement = document.createElement('div'); + return overlayContainerElement; + } + }; + }}, + ]); + }); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; @@ -96,7 +96,6 @@ describe('MdTooltip', () => { @Component({ selector: 'app', - directives: [MD_TOOLTIP_DIRECTIVES], template: `` }) class BasicTooltipDemo { diff --git a/src/components/tooltip/tooltip.ts b/src/components/tooltip/tooltip.ts index 99d168dcf170..34616c62471f 100644 --- a/src/components/tooltip/tooltip.ts +++ b/src/components/tooltip/tooltip.ts @@ -1,11 +1,22 @@ -import {Component, ComponentRef, Directive, Input, ElementRef, ViewContainerRef, - ChangeDetectorRef} from '@angular/core'; -import {Overlay} from '@angular2-material/core/overlay/overlay'; -import {OverlayState} from '@angular2-material/core/overlay/overlay-state'; -import {OverlayRef} from '@angular2-material/core/overlay/overlay-ref'; -import {ComponentPortal} from '@angular2-material/core/portal/portal'; -import {OverlayConnectionPosition, OriginConnectionPosition} from - '@angular2-material/core/overlay/position/connected-position'; +import { + NgModule, + Component, + ComponentRef, + Directive, + Input, + ElementRef, + ViewContainerRef, + ChangeDetectorRef +} from '@angular/core'; +import { + Overlay, + OverlayState, + OverlayModule, + OverlayRef, + ComponentPortal, + OverlayConnectionPosition, + OriginConnectionPosition, +} from '@angular2-material/core/core'; export type TooltipPosition = 'before' | 'after' | 'above' | 'below'; @@ -181,3 +192,12 @@ class TooltipComponent { } export const MD_TOOLTIP_DIRECTIVES = [MdTooltip]; + + +@NgModule({ + imports: [OverlayModule], + exports: [MD_TOOLTIP_DIRECTIVES, TooltipComponent], + declarations: [MD_TOOLTIP_DIRECTIVES, TooltipComponent], + entryComponents: [TooltipComponent], +}) +export class MdTooltipModule { } diff --git a/src/core/a11y/live-announcer.spec.ts b/src/core/a11y/live-announcer.spec.ts index 6fa6f9a7738a..620e486b67a1 100644 --- a/src/core/a11y/live-announcer.spec.ts +++ b/src/core/a11y/live-announcer.spec.ts @@ -4,9 +4,9 @@ import { flushMicrotasks, tick, addProviders, - getTestInjector + TestComponentBuilder, + ComponentFixture, } from '@angular/core/testing'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; import {MdLiveAnnouncer, LIVE_ANNOUNCER_ELEMENT_TOKEN} from './live-announcer'; @@ -16,102 +16,110 @@ describe('MdLiveAnnouncer', () => { let builder: TestComponentBuilder; let liveEl: Element; - beforeEach(() => { - addProviders([ - MdLiveAnnouncer, - ]); - }); + describe('with default element', () => { + beforeEach(() => { + addProviders([MdLiveAnnouncer]); + }); - beforeEach(inject([TestComponentBuilder, MdLiveAnnouncer], - (tcb: TestComponentBuilder, _live: MdLiveAnnouncer) => { - builder = tcb; - live = _live; - liveEl = getLiveElement(); - })); + beforeEach(inject([TestComponentBuilder, MdLiveAnnouncer], + (tcb: TestComponentBuilder, _live: MdLiveAnnouncer) => { + builder = tcb; + live = _live; + liveEl = getLiveElement(); + })); + + afterEach(() => { + // In our tests we always remove the current live element, because otherwise we would have + // multiple live elements due multiple service instantiations. + liveEl.parentNode.removeChild(liveEl); + }); - afterEach(() => { - // In our tests we always remove the current live element, because otherwise we would have - // multiple live elements due multiple service instantiations. - liveEl.parentNode.removeChild(liveEl); - }); + it('should correctly update the announce text', fakeAsyncTest(() => { + let appFixture: ComponentFixture = null; - it('should correctly update the announce text', fakeAsyncTest(() => { - let appFixture: ComponentFixture = null; + builder.createAsync(TestApp).then(fixture => { + appFixture = fixture; + }); - builder.createAsync(TestApp).then(fixture => { - appFixture = fixture; - }); + flushMicrotasks(); - flushMicrotasks(); + let buttonElement = appFixture.debugElement + .query(By.css('button')).nativeElement; - let buttonElement = appFixture.debugElement - .query(By.css('button')).nativeElement; + buttonElement.click(); - buttonElement.click(); + // This flushes our 100ms timeout for the screenreaders. + tick(100); - // This flushes our 100ms timeout for the screenreaders. - tick(100); + expect(liveEl.textContent).toBe('Test'); + })); - expect(liveEl.textContent).toBe('Test'); - })); + it('should correctly update the politeness attribute', fakeAsyncTest(() => { + let appFixture: ComponentFixture = null; - it('should correctly update the politeness attribute', fakeAsyncTest(() => { - let appFixture: ComponentFixture = null; + builder.createAsync(TestApp).then(fixture => { + appFixture = fixture; + }); - builder.createAsync(TestApp).then(fixture => { - appFixture = fixture; - }); + flushMicrotasks(); - flushMicrotasks(); + live.announce('Hey Google', 'assertive'); - live.announce('Hey Google', 'assertive'); + // This flushes our 100ms timeout for the screenreaders. + tick(100); - // This flushes our 100ms timeout for the screenreaders. - tick(100); + expect(liveEl.textContent).toBe('Hey Google'); + expect(liveEl.getAttribute('aria-live')).toBe('assertive'); + })); - expect(liveEl.textContent).toBe('Hey Google'); - expect(liveEl.getAttribute('aria-live')).toBe('assertive'); - })); + it('should apply the aria-live value polite by default', fakeAsyncTest(() => { + let appFixture: ComponentFixture = null; - it('should apply the aria-live value polite by default', fakeAsyncTest(() => { - let appFixture: ComponentFixture = null; + builder.createAsync(TestApp).then(fixture => { + appFixture = fixture; + }); - builder.createAsync(TestApp).then(fixture => { - appFixture = fixture; - }); + flushMicrotasks(); - flushMicrotasks(); + live.announce('Hey Google'); - live.announce('Hey Google'); + // This flushes our 100ms timeout for the screenreaders. + tick(100); - // This flushes our 100ms timeout for the screenreaders. - tick(100); + expect(liveEl.textContent).toBe('Hey Google'); + expect(liveEl.getAttribute('aria-live')).toBe('polite'); + })); + }); - expect(liveEl.textContent).toBe('Hey Google'); - expect(liveEl.getAttribute('aria-live')).toBe('polite'); - })); + describe('with a custom element', () => { + let customLiveElement: HTMLElement; - it('should allow to use a custom live element', fakeAsyncTest(() => { - let customLiveEl = document.createElement('div'); + beforeEach(() => { + customLiveElement = document.createElement('div'); - // We need to reset our test injector here, because it is already instantiated above. - getTestInjector().reset(); + addProviders([ + {provide: LIVE_ANNOUNCER_ELEMENT_TOKEN, useValue: customLiveElement}, + MdLiveAnnouncer, + ]); + }); - getTestInjector().addProviders([ - {provide: LIVE_ANNOUNCER_ELEMENT_TOKEN, useValue: customLiveEl}, - MdLiveAnnouncer - ]); + beforeEach(inject([TestComponentBuilder, MdLiveAnnouncer], + (tcb: TestComponentBuilder, _live: MdLiveAnnouncer) => { + builder = tcb; + live = _live; + liveEl = getLiveElement(); + })); - let injector = getTestInjector().createInjector(); - let liveService: MdLiveAnnouncer = injector.get(MdLiveAnnouncer); - liveService.announce('Custom Element'); + it('should allow to use a custom live element', fakeAsyncTest(() => { + live.announce('Custom Element'); - // This flushes our 100ms timeout for the screenreaders. - tick(100); + // This flushes our 100ms timeout for the screenreaders. + tick(100); - expect(customLiveEl.textContent).toBe('Custom Element'); - })); + expect(customLiveElement.textContent).toBe('Custom Element'); + })); + }); }); diff --git a/src/core/core.ts b/src/core/core.ts index 849f1cf16f46..6af3af571109 100644 --- a/src/core/core.ts +++ b/src/core/core.ts @@ -12,7 +12,8 @@ export { export { PortalHostDirective, TemplatePortalDirective, - PORTAL_DIRECTIVES + PORTAL_DIRECTIVES, + PortalModule, } from './portal/portal-directives'; export {DomPortalHost} from './portal/dom-portal-host'; @@ -24,8 +25,13 @@ export {OverlayState} from './overlay/overlay-state'; export { ConnectedOverlayDirective, OverlayOrigin, - OVERLAY_DIRECTIVES + OVERLAY_DIRECTIVES, + OverlayModule, } from './overlay/overlay-directives'; +export { + OverlayConnectionPosition, + OriginConnectionPosition +} from './overlay/position/connected-position'; // Gestures export {MdGestureConfig} from './gestures/MdGestureConfig'; diff --git a/src/core/line/line.ts b/src/core/line/line.ts index 90935c125cab..985814c9c4ed 100644 --- a/src/core/line/line.ts +++ b/src/core/line/line.ts @@ -1,4 +1,5 @@ import { + NgModule, Directive, Renderer, ElementRef, @@ -42,3 +43,9 @@ export class MdLineSetter { } } + +@NgModule({ + exports: [MdLine], + declarations: [MdLine], +}) +export class MdLineModule { } diff --git a/src/core/overlay/overlay-directives.spec.ts b/src/core/overlay/overlay-directives.spec.ts index 4ca27565f1d5..c2cf7d5971c3 100644 --- a/src/core/overlay/overlay-directives.spec.ts +++ b/src/core/overlay/overlay-directives.spec.ts @@ -4,8 +4,9 @@ import { fakeAsync, flushMicrotasks, addProviders, + TestComponentBuilder, + ComponentFixture, } from '@angular/core/testing'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; import {Component, ViewChild} from '@angular/core'; import {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives'; import {Overlay} from './overlay'; @@ -78,7 +79,6 @@ describe('Overlay directives', () => { `, - directives: [ConnectedOverlayDirective, OverlayOrigin], }) class ConnectedOverlayDirectiveTest { @ViewChild(ConnectedOverlayDirective) connectedOverlayDirective: ConnectedOverlayDirective; diff --git a/src/core/overlay/overlay-directives.ts b/src/core/overlay/overlay-directives.ts index e31c9e8675d1..c2233a0e65f2 100644 --- a/src/core/overlay/overlay-directives.ts +++ b/src/core/overlay/overlay-directives.ts @@ -1,4 +1,5 @@ import { + NgModule, Directive, TemplateRef, ViewContainerRef, @@ -7,11 +8,12 @@ import { OnDestroy, ElementRef } from '@angular/core'; -import {Overlay} from './overlay'; +import {Overlay, OVERLAY_PROVIDERS} from './overlay'; import {OverlayRef} from './overlay-ref'; import {TemplatePortal} from '../portal/portal'; import {OverlayState} from './overlay-state'; import {ConnectionPositionPair} from './position/connected-position'; +import {PortalModule} from '../portal/portal-directives'; /** Default set of positions for the overlay. Follows the behavior of a dropdown. */ let defaultPositionList = [ @@ -105,3 +107,12 @@ export class ConnectedOverlayDirective implements OnInit, OnDestroy { export const OVERLAY_DIRECTIVES = [ConnectedOverlayDirective, OverlayOrigin]; + + +@NgModule({ + imports: [PortalModule], + exports: OVERLAY_DIRECTIVES, + declarations: OVERLAY_DIRECTIVES, + providers: OVERLAY_PROVIDERS, +}) +export class OverlayModule { } diff --git a/src/core/overlay/overlay.spec.ts b/src/core/overlay/overlay.spec.ts index ec04528aae20..f6fbe0035f7c 100644 --- a/src/core/overlay/overlay.spec.ts +++ b/src/core/overlay/overlay.spec.ts @@ -3,13 +3,11 @@ import { fakeAsync, flushMicrotasks, addProviders, + TestComponentBuilder, + configureModule, + async, } from '@angular/core/testing'; -import {TestComponentBuilder} from '@angular/compiler/testing'; -import { - Component, - ViewChild, - ViewContainerRef, -} from '@angular/core'; +import {Component, ViewChild, ViewContainerRef} from '@angular/core'; import {TemplatePortalDirective} from '../portal/portal-directives'; import {TemplatePortal, ComponentPortal} from '../portal/portal'; import {Overlay} from './overlay'; @@ -19,6 +17,7 @@ import {OverlayState} from './overlay-state'; import {PositionStrategy} from './position/position-strategy'; import {OverlayPositionBuilder} from './position/overlay-position-builder'; import {ViewportRuler} from './position/viewport-ruler'; +import {OverlayModule} from './overlay-directives'; describe('Overlay', () => { @@ -28,7 +27,13 @@ describe('Overlay', () => { let templatePortal: TemplatePortal; let overlayContainerElement: HTMLElement; - beforeEach(() => { + beforeEach(async(() => { + configureModule({ + imports: [OverlayModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); + addProviders([ Overlay, OverlayPositionBuilder, @@ -42,8 +47,9 @@ describe('Overlay', () => { } }; }} - ]); - }); + ]) + })); + let deps = [TestComponentBuilder, Overlay]; beforeEach(inject(deps, fakeAsync((tcb: TestComponentBuilder, o: Overlay) => { @@ -59,7 +65,7 @@ describe('Overlay', () => { flushMicrotasks(); }))); - it('should load a component into an overlay', fakeAsyncTest(() => { + it('should load a component into an overlay', fakeAsync(() => { let overlayRef: OverlayRef; overlay.create().then(ref => { @@ -76,7 +82,7 @@ describe('Overlay', () => { expect(overlayContainerElement.textContent).toBe(''); })); - it('should load a template portal into an overlay', fakeAsyncTest(() => { + xit('should load a template portal into an overlay', fakeAsync(() => { let overlayRef: OverlayRef; overlay.create().then(ref => { @@ -93,7 +99,7 @@ describe('Overlay', () => { expect(overlayContainerElement.textContent).toBe(''); })); - it('should open multiple overlays', fakeAsyncTest(() => { + xit('should open multiple overlays', fakeAsync(() => { let pizzaOverlayRef: OverlayRef; let cakeOverlayRef: OverlayRef; @@ -131,7 +137,7 @@ describe('Overlay', () => { state = new OverlayState(); }); - it('should apply the positioning strategy', fakeAsyncTest(() => { + it('should apply the positioning strategy', fakeAsync(() => { state.positionStrategy = new FakePositionStrategy(); overlay.create(state).then(ref => { @@ -151,23 +157,22 @@ describe('Overlay', () => { selector: 'pizza-msg', template: '

Pizza

', }) -class PizzaMsg { -} +class PizzaMsg { } /** Test-bed component that contains a TempatePortal and an ElementRef. */ @Component({ selector: 'portal-test', template: ``, - directives: [TemplatePortalDirective], }) class TestComponentWithTemplatePortals { @ViewChild(TemplatePortalDirective) templatePortal: TemplatePortalDirective; - constructor(public viewContainerRef: ViewContainerRef) { - } + constructor(public viewContainerRef: ViewContainerRef) { } } +const TEST_COMPONENTS = [TestComponentWithTemplatePortals, PizzaMsg]; + class FakePositionStrategy implements PositionStrategy { apply(element: Element): Promise { element.classList.add('fake-positioned'); @@ -176,6 +181,3 @@ class FakePositionStrategy implements PositionStrategy { } -function fakeAsyncTest(fn: () => void) { - return inject([], fakeAsync(fn)); -} diff --git a/src/core/overlay/overlay.ts b/src/core/overlay/overlay.ts index 934806eb83a0..189202ea43bf 100644 --- a/src/core/overlay/overlay.ts +++ b/src/core/overlay/overlay.ts @@ -1,4 +1,5 @@ import { + NgModule, ComponentResolver, Injectable, } from '@angular/core'; @@ -9,6 +10,7 @@ import {OverlayRef} from './overlay-ref'; import {OverlayPositionBuilder} from './position/overlay-position-builder'; import {ViewportRuler} from './position/viewport-ruler'; import {OverlayContainer} from './overlay-container'; +import {PortalModule} from '../portal/portal-directives'; /** Next overlay unique ID. */ let nextUniqueId = 0; @@ -89,3 +91,4 @@ export const OVERLAY_PROVIDERS = [ OverlayPositionBuilder, Overlay, ]; + diff --git a/src/core/portal/portal-directives.ts b/src/core/portal/portal-directives.ts index f5094f94f3fc..90fa13afa4e9 100644 --- a/src/core/portal/portal-directives.ts +++ b/src/core/portal/portal-directives.ts @@ -1,4 +1,5 @@ import { + NgModule, ComponentRef, Directive, TemplateRef, @@ -103,3 +104,10 @@ export class PortalHostDirective extends BasePortalHost { } export const PORTAL_DIRECTIVES = [TemplatePortalDirective, PortalHostDirective]; + + +@NgModule({ + exports: PORTAL_DIRECTIVES, + declarations: PORTAL_DIRECTIVES, +}) +export class PortalModule { } diff --git a/src/core/portal/portal.spec.ts b/src/core/portal/portal.spec.ts index 9a8c0fae012b..dde7f1ed2554 100644 --- a/src/core/portal/portal.spec.ts +++ b/src/core/portal/portal.spec.ts @@ -1,9 +1,10 @@ import { inject, fakeAsync, - flushMicrotasks + flushMicrotasks, + TestComponentBuilder, + ComponentFixture, } from '@angular/core/testing'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; import { Component, ViewChildren, @@ -413,9 +414,7 @@ class ArbitraryViewContainerRefComponent {
Pie
- - `, - directives: [PortalHostDirective, TemplatePortalDirective], + `, }) class PortalTestApp { @ViewChildren(TemplatePortalDirective) portals: QueryList; diff --git a/src/core/ripple/ripple.spec.ts b/src/core/ripple/ripple.spec.ts index c0c6b34e3a18..e01251a8e4fa 100644 --- a/src/core/ripple/ripple.spec.ts +++ b/src/core/ripple/ripple.spec.ts @@ -1,15 +1,12 @@ import { - describe, - it, - beforeEach, - afterEach, + configureModule, inject, async, - expect, + TestComponentBuilder, + ComponentFixture, } from '@angular/core/testing'; -import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing'; import {Component, ViewChild} from '@angular/core'; -import {MdRipple} from './ripple'; +import {MdRipple, MdRippleModule} from './ripple'; /** Creates a DOM event to indicate that a CSS transition for the given property ended. */ const createTransitionEndEvent = (propertyName: string) => { @@ -70,6 +67,14 @@ describe('MdRipple', () => { let rippleBackground: Element; let originalBodyMargin: string; + beforeEach(async(() => { + configureModule({ + imports: [MdRippleModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); + })); + beforeEach(() => { // Set body margin to 0 during tests so it doesn't mess up position calculations. originalBodyMargin = document.body.style.margin; @@ -306,7 +311,6 @@ describe('MdRipple', () => { }); @Component({ - directives: [MdRipple], template: `
@@ -317,7 +321,6 @@ class BasicRippleContainer { } @Component({ - directives: [MdRipple], template: `
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; +import {NgModule, ApplicationRef} from '@angular/core'; +import {HAMMER_GESTURE_CONFIG, BrowserModule} from '@angular/platform-browser'; +import {HttpModule} from '@angular/http'; +import {FormsModule} from '@angular/forms'; +import {CommonModule} from '@angular/common'; import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer'; import {MdGestureConfig} from '@angular2-material/core/gestures/MdGestureConfig'; import {MdIconRegistry} from '@angular2-material/icon/icon-registry'; import {OverlayContainer} from '@angular2-material/core/overlay/overlay-container'; -import {DemoApp} from './demo-app/demo-app'; +import {DemoApp, Home} from './demo-app/demo-app'; import {DEMO_APP_ROUTE_PROVIDER} from './demo-app/routes'; +import {RouterModule} from '@angular/router'; -bootstrap(DemoApp, [ - DEMO_APP_ROUTE_PROVIDER, - disableDeprecatedForms(), - provideForms(), - MdLiveAnnouncer, - HTTP_PROVIDERS, - OverlayContainer, - MdIconRegistry, - {provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig}, -]); +// component modules +import {MdButtonToggleModule} from '@angular2-material/button-toggle/button-toggle'; +import {MdButtonModule} from '@angular2-material/button/button'; +import {MdCheckboxModule} from '@angular2-material/checkbox/checkbox'; +import {MdRadioModule} from '@angular2-material/radio/radio'; +import {MdSlideToggleModule} from '@angular2-material/slide-toggle/slide-toggle'; +import {MdSliderModule} from '@angular2-material/slider/slider'; +import {MdSidenavModule} from '@angular2-material/sidenav/sidenav'; +import {MdListModule} from '@angular2-material/list/list'; +import {MdGridListModule} from '@angular2-material/grid-list/grid-list'; +import {MdCardModule} from '@angular2-material/card/card'; +import {MdIconModule} from '@angular2-material/icon/icon'; +import {MdProgressCircleModule} from '@angular2-material/progress-circle/progress-circle'; +import {MdProgressBarModule} from '@angular2-material/progress-bar/progress-bar'; +import {MdInputModule} from '@angular2-material/input/input'; +import {MdTabsModule} from '@angular2-material/tabs/tabs'; +import {MdToolbarModule} from '@angular2-material/toolbar/toolbar'; +import {MdTooltipModule} from '@angular2-material/tooltip/tooltip'; +import {MdRippleModule} from '@angular2-material/core/ripple/ripple'; +import {PortalModule} from '@angular2-material/core/portal/portal-directives'; +import {OverlayModule} from '@angular2-material/core/overlay/overlay-directives'; +import {MdMenuModule} from '@angular2-material/menu/menu'; +import {MdDialogModule} from '@angular2-material/dialog/dialog'; +import {RtlModule} from '@angular2-material/core/rtl/dir'; + + + + +// demo components +import {ProgressBarDemo} from './progress-bar/progress-bar-demo'; +import {JazzDialog, DialogDemo} from './dialog/dialog-demo'; +import {RippleDemo} from './ripple/ripple-demo'; +import {IconDemo} from './icon/icon-demo'; +import {GesturesDemo} from './gestures/gestures-demo'; +import {InputDemo} from './input/input-demo'; +import {CardDemo} from './card/card-demo'; +import {RadioDemo} from './radio/radio-demo'; +import {ButtonToggleDemo} from './button-toggle/button-toggle-demo'; +import {ProgressCircleDemo} from './progress-circle/progress-circle-demo'; +import {TooltipDemo} from './tooltip/tooltip-demo'; +import {ListDemo} from './list/list-demo'; +import {BaselineDemo} from './baseline/baseline-demo'; +import {GridListDemo} from './grid-list/grid-list-demo'; +import {LiveAnnouncerDemo} from './live-announcer/live-announcer-demo'; +import {OverlayDemo, SpagettiPanel, RotiniPanel} from './overlay/overlay-demo'; +import {SlideToggleDemo} from './slide-toggle/slide-toggle-demo'; +import {ToolbarDemo} from './toolbar/toolbar-demo'; +import {ButtonDemo} from './button/button-demo'; +import {MdCheckboxDemoNestedChecklist, CheckboxDemo} from './checkbox/checkbox-demo'; +import {SliderDemo} from './slider/slider-demo'; +import {SidenavDemo} from './sidenav/sidenav-demo'; +import {PortalDemo, ScienceJoke} from './portal/portal-demo'; +import {MenuDemo} from './menu/menu-demo'; +import {TabsDemo} from './tabs/tab-group-demo'; + + + +const MATERIAL_COMPONENTS = [ + PortalModule, + OverlayModule, + RtlModule, + MdButtonModule, + MdButtonToggleModule, + MdCheckboxModule, + MdRadioModule, + MdSlideToggleModule, + MdSliderModule, + MdSidenavModule, + MdListModule, + MdGridListModule, + MdCardModule, + MdIconModule, + MdProgressCircleModule, + MdProgressBarModule, + MdInputModule, + MdTabsModule, + MdToolbarModule, + MdTooltipModule, + MdRippleModule, + MdMenuModule, + MdDialogModule, +]; + +@NgModule(({ + imports: MATERIAL_COMPONENTS, + exports: MATERIAL_COMPONENTS, +})) +export class MaterialModule { } + +@NgModule({ + imports: [BrowserModule, RouterModule, FormsModule, HttpModule, MaterialModule], + providers: [ + DEMO_APP_ROUTE_PROVIDER, + MdLiveAnnouncer, + {provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig}, + MdIconRegistry, + OverlayContainer, + ], + declarations: [ + DemoApp, + ListDemo, + TooltipDemo, + ProgressCircleDemo, + ButtonToggleDemo, + RadioDemo, + CardDemo, + InputDemo, + GesturesDemo, + IconDemo, + RippleDemo, + DialogDemo, + JazzDialog, + Home, + ProgressBarDemo, + BaselineDemo, + GridListDemo, + LiveAnnouncerDemo, + OverlayDemo, + SlideToggleDemo, + ToolbarDemo, + ButtonDemo, + MdCheckboxDemoNestedChecklist, + CheckboxDemo, + SliderDemo, + SidenavDemo, + PortalDemo, + ScienceJoke, + MenuDemo, + TabsDemo, + SpagettiPanel, + RotiniPanel, + ], + entryComponents: [DemoApp, SpagettiPanel, RotiniPanel, JazzDialog, ScienceJoke], +}) +export class DemoAppModule { + constructor(appRef: ApplicationRef) { + appRef.bootstrap(DemoApp); + } +} + + +platformBrowserDynamic().bootstrapModule(DemoAppModule); + +// bootstrap(DemoApp, [ +// DEMO_APP_ROUTE_PROVIDER, +// disableDeprecatedForms(), +// provideForms(), +// MdLiveAnnouncer, +// HTTP_PROVIDERS, +// OverlayContainer, +// MdIconRegistry, +// {provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig}, +// ]); diff --git a/src/demo-app/menu/menu-demo.ts b/src/demo-app/menu/menu-demo.ts index 2d0e04a3d610..6ea2956899d4 100644 --- a/src/demo-app/menu/menu-demo.ts +++ b/src/demo-app/menu/menu-demo.ts @@ -9,12 +9,6 @@ import {MD_TOOLBAR_DIRECTIVES} from '@angular2-material/toolbar/toolbar'; selector: 'menu-demo', templateUrl: 'menu-demo.html', styleUrls: ['menu-demo.css'], - directives: [ - MD_MENU_DIRECTIVES, - MD_ICON_DIRECTIVES, - MD_BUTTON_DIRECTIVES, - MD_TOOLBAR_DIRECTIVES, - ] }) export class MenuDemo { selected = ''; diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts index f3655f9498c1..a46d53160f89 100644 --- a/src/demo-app/overlay/overlay-demo.ts +++ b/src/demo-app/overlay/overlay-demo.ts @@ -25,7 +25,6 @@ import { selector: 'overlay-demo', templateUrl: 'overlay-demo.html', styleUrls: ['overlay-demo.css'], - directives: [PORTAL_DIRECTIVES, OVERLAY_DIRECTIVES, NgIf], providers: [OVERLAY_PROVIDERS], encapsulation: ViewEncapsulation.None, }) @@ -91,7 +90,7 @@ export class OverlayDemo { selector: 'rotini-panel', template: '

Rotini {{value}}

' }) -class RotiniPanel { +export class RotiniPanel { value: number = 9000; } @@ -100,6 +99,6 @@ class RotiniPanel { selector: 'spagetti-panel', template: '
Spagetti {{value}}
' }) -class SpagettiPanel { +export class SpagettiPanel { value: string = 'Omega'; } diff --git a/src/demo-app/portal/portal-demo.ts b/src/demo-app/portal/portal-demo.ts index 6b274dce23c9..8c3e5f4e0eb3 100644 --- a/src/demo-app/portal/portal-demo.ts +++ b/src/demo-app/portal/portal-demo.ts @@ -13,7 +13,6 @@ import { selector: 'portal-demo', templateUrl: 'portal-demo.html', styleUrls: ['portal-demo.css'], - directives: [TemplatePortalDirective, PortalHostDirective, NgFor] }) export class PortalDemo { @ViewChildren(TemplatePortalDirective) templatePortals: QueryList>; diff --git a/src/demo-app/progress-bar/progress-bar-demo.ts b/src/demo-app/progress-bar/progress-bar-demo.ts index df6244402cc5..e9aec5717bf4 100644 --- a/src/demo-app/progress-bar/progress-bar-demo.ts +++ b/src/demo-app/progress-bar/progress-bar-demo.ts @@ -9,7 +9,6 @@ import {MdProgressBar} from '@angular2-material/progress-bar/progress-bar'; selector: 'progress-bar-demo', templateUrl: 'progress-bar-demo.html', styleUrls: ['progress-bar-demo.css'], - directives: [MdProgressBar, MdButton] }) export class ProgressBarDemo { determinateProgressValue: number = 30; diff --git a/src/demo-app/progress-circle/progress-circle-demo.ts b/src/demo-app/progress-circle/progress-circle-demo.ts index f19bf4cc8ab4..c3edd1f73d9b 100644 --- a/src/demo-app/progress-circle/progress-circle-demo.ts +++ b/src/demo-app/progress-circle/progress-circle-demo.ts @@ -7,7 +7,6 @@ import {MdProgressCircle, MdSpinner} from '@angular2-material/progress-circle/pr selector: 'progress-circle-demo', templateUrl: 'progress-circle-demo.html', styleUrls: ['progress-circle-demo.css'], - directives: [MdProgressCircle, MdSpinner, MdButton] }) export class ProgressCircleDemo { progressValue: number = 40; diff --git a/src/demo-app/radio/radio-demo.ts b/src/demo-app/radio/radio-demo.ts index b146828d208a..22e9e546c611 100644 --- a/src/demo-app/radio/radio-demo.ts +++ b/src/demo-app/radio/radio-demo.ts @@ -13,7 +13,6 @@ import { templateUrl: 'radio-demo.html', styleUrls: ['radio-demo.css'], providers: [MdUniqueSelectionDispatcher], - directives: [MdCheckbox, MD_RADIO_DIRECTIVES, FORM_DIRECTIVES, NgFor] }) export class RadioDemo { isDisabled: boolean = false; diff --git a/src/demo-app/ripple/ripple-demo.ts b/src/demo-app/ripple/ripple-demo.ts index e2be9f254852..f9725266f38c 100644 --- a/src/demo-app/ripple/ripple-demo.ts +++ b/src/demo-app/ripple/ripple-demo.ts @@ -19,15 +19,6 @@ import {MD_RIPPLE_DIRECTIVES, MdRipple} from '@angular2-material/core/core'; templateUrl: 'ripple-demo.html', styleUrls: ['ripple-demo.css'], providers: [MdUniqueSelectionDispatcher], - directives: [ - MD_BUTTON_DIRECTIVES, - MD_CARD_DIRECTIVES, - MD_CHECKBOX_DIRECTIVES, - MD_ICON_DIRECTIVES, - MD_INPUT_DIRECTIVES, - MD_RADIO_DIRECTIVES, - MD_RIPPLE_DIRECTIVES, - ], }) export class RippleDemo { @ViewChild(MdRipple) manualRipple: MdRipple; diff --git a/src/demo-app/sidenav/sidenav-demo.ts b/src/demo-app/sidenav/sidenav-demo.ts index 39920a021e5f..4070a7a53593 100644 --- a/src/demo-app/sidenav/sidenav-demo.ts +++ b/src/demo-app/sidenav/sidenav-demo.ts @@ -7,6 +7,5 @@ import {MD_SIDENAV_DIRECTIVES} from '@angular2-material/sidenav/sidenav'; selector: 'sidenav-demo', templateUrl: 'sidenav-demo.html', styleUrls: ['sidenav-demo.css'], - directives: [MD_SIDENAV_DIRECTIVES, MdButton] }) export class SidenavDemo {} diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.ts b/src/demo-app/slide-toggle/slide-toggle-demo.ts index 422a85aa0c66..39559f0948de 100644 --- a/src/demo-app/slide-toggle/slide-toggle-demo.ts +++ b/src/demo-app/slide-toggle/slide-toggle-demo.ts @@ -7,6 +7,5 @@ import {MdSlideToggle} from '@angular2-material/slide-toggle/slide-toggle'; selector: 'switch-demo', templateUrl: 'slide-toggle-demo.html', styleUrls: ['slide-toggle-demo.css'], - directives: [MdSlideToggle, FORM_DIRECTIVES] }) export class SlideToggleDemo {} diff --git a/src/demo-app/slider/slider-demo.ts b/src/demo-app/slider/slider-demo.ts index ec77e356b61e..eb0e629a938b 100644 --- a/src/demo-app/slider/slider-demo.ts +++ b/src/demo-app/slider/slider-demo.ts @@ -5,6 +5,5 @@ import {MD_SLIDER_DIRECTIVES} from '@angular2-material/slider/slider'; moduleId: module.id, selector: 'slider-demo', templateUrl: 'slider-demo.html', - directives: [MD_SLIDER_DIRECTIVES], }) export class SliderDemo { } diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts index ef20dee089dc..e4cf1a652db0 100644 --- a/src/demo-app/system-config.ts +++ b/src/demo-app/system-config.ts @@ -3,6 +3,7 @@ **********************************************************************************************/ const components = [ + 'all', 'button', 'card', 'checkbox', @@ -28,7 +29,7 @@ const components = [ const map: any = { '@angular2-material/core': 'core', }; -components.forEach(name => map[`@angular2-material/${name}`] = `components/${name}`); +components.forEach(name => {map[`@angular2-material/${name}`] = `components/${name}`; console.log(name)}); /** User packages configuration. */ diff --git a/src/demo-app/tabs/tab-group-demo.ts b/src/demo-app/tabs/tab-group-demo.ts index 8f8ff51a3606..f62941a4c618 100644 --- a/src/demo-app/tabs/tab-group-demo.ts +++ b/src/demo-app/tabs/tab-group-demo.ts @@ -11,7 +11,6 @@ import {Observable} from 'rxjs/Observable'; selector: 'tab-group-demo', templateUrl: 'tab-group-demo.html', styleUrls: ['tab-group-demo.css'], - directives: [MD_TABS_DIRECTIVES, MdToolbar, MdInput, NgIf, FORM_DIRECTIVES, NgFor], pipes: [AsyncPipe], encapsulation: ViewEncapsulation.None, }) diff --git a/src/demo-app/toolbar/toolbar-demo.ts b/src/demo-app/toolbar/toolbar-demo.ts index dd5433f39ae7..b27acede0317 100644 --- a/src/demo-app/toolbar/toolbar-demo.ts +++ b/src/demo-app/toolbar/toolbar-demo.ts @@ -7,7 +7,6 @@ import {MdToolbar} from '@angular2-material/toolbar/toolbar'; selector: 'toolbar-demo', templateUrl: 'toolbar-demo.html', styleUrls: ['toolbar-demo.css'], - directives: [MdToolbar, MdIcon] }) export class ToolbarDemo { diff --git a/src/demo-app/tooltip/tooltip-demo.ts b/src/demo-app/tooltip/tooltip-demo.ts index 9ce01008c41f..d322a942f94c 100644 --- a/src/demo-app/tooltip/tooltip-demo.ts +++ b/src/demo-app/tooltip/tooltip-demo.ts @@ -11,8 +11,6 @@ import {MD_BUTTON_DIRECTIVES} from '@angular2-material/button/button'; selector: 'tooltip-demo', templateUrl: 'tooltip-demo.html', styleUrls: ['tooltip-demo.css'], - directives: [MD_TOOLTIP_DIRECTIVES, MD_RADIO_DIRECTIVES, MD_BUTTON_DIRECTIVES], - providers: [OVERLAY_PROVIDERS, MdUniqueSelectionDispatcher], }) export class TooltipDemo { position: TooltipPosition = 'below'; diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js index ddd6557af953..871382b61092 100644 --- a/test/karma-test-shim.js +++ b/test/karma-test-shim.js @@ -37,8 +37,9 @@ System.import('system-config.js').then(function() { var testing = providers[0]; var testingBrowser = providers[1]; - testing.setBaseTestProviders(testingBrowser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS, - testingBrowser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS); + testing.initTestEnvironment( + testingBrowser.BrowserDynamicTestingModule, + testingBrowser.platformBrowserDynamicTesting()); }); }).then(function() { // Finally, load all spec files. From cc6031f130fd013aea3d3408f9f0beb649ddc1b6 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Thu, 28 Jul 2016 12:10:39 -0700 Subject: [PATCH 02/23] fix dialog, tabs, and list --- src/components/dialog/dialog.ts | 16 +++++++++------- src/components/grid-list/grid-list.ts | 2 +- src/components/list/list.ts | 2 +- src/components/tabs/tabs.ts | 6 +++--- src/demo-app/system-config.ts | 3 +-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts index 87d48e9d9799..e27b6edeca86 100644 --- a/src/components/dialog/dialog.ts +++ b/src/components/dialog/dialog.ts @@ -1,15 +1,17 @@ import {NgModule, Injector, ComponentRef, Injectable} from '@angular/core'; -import {Overlay} from '@angular2-material/core/overlay/overlay'; -import {OverlayRef} from '@angular2-material/core/overlay/overlay-ref'; -import {OverlayState} from '@angular2-material/core/overlay/overlay-state'; -import {ComponentPortal} from '@angular2-material/core/portal/portal'; +import { + Overlay, + OverlayModule, + PortalModule, + OverlayRef, + OverlayState, + ComponentPortal, +} from '@angular2-material/core/core'; import {ComponentType} from '@angular2-material/core/overlay/generic-component-type'; import {MdDialogConfig} from './dialog-config'; import {MdDialogRef} from './dialog-ref'; import {DialogInjector} from './dialog-injector'; import {MdDialogContainer} from './dialog-container'; -import {OverlayModule} from '../../core/overlay/overlay-directives'; - export {MdDialogConfig} from './dialog-config'; export {MdDialogRef} from './dialog-ref'; @@ -120,7 +122,7 @@ export class MdDialog { @NgModule({ - imports: [OverlayModule], + imports: [OverlayModule, PortalModule], exports: [MdDialogContainer], declarations: [MdDialogContainer], entryComponents: [MdDialogContainer], diff --git a/src/components/grid-list/grid-list.ts b/src/components/grid-list/grid-list.ts index 104573f4d13b..b7ffd0675591 100644 --- a/src/components/grid-list/grid-list.ts +++ b/src/components/grid-list/grid-list.ts @@ -157,7 +157,7 @@ export const MD_GRID_LIST_DIRECTIVES: any[] = [MdGridList, MdGridTile, MdGridTil @NgModule({ imports: [MdLineModule], - exports: MD_GRID_LIST_DIRECTIVES, + exports: [MD_GRID_LIST_DIRECTIVES, MdLineModule], declarations: MD_GRID_LIST_DIRECTIVES, }) export class MdGridListModule { } diff --git a/src/components/list/list.ts b/src/components/list/list.ts index 92fd191e40f2..2768e7a95bbf 100644 --- a/src/components/list/list.ts +++ b/src/components/list/list.ts @@ -70,7 +70,7 @@ export const MD_LIST_DIRECTIVES = [MdList, MdListItem, MdListAvatar]; @NgModule({ imports: [MdLineModule], - exports: MD_LIST_DIRECTIVES, + exports: [MD_LIST_DIRECTIVES, MdLineModule], declarations: MD_LIST_DIRECTIVES, }) export class MdListModule { } diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts index a936fcd9c23a..42e039faf45b 100644 --- a/src/components/tabs/tabs.ts +++ b/src/components/tabs/tabs.ts @@ -197,11 +197,11 @@ export class MdTabGroup { } export const MD_TABS_DIRECTIVES = [MdTabGroup, MdTabLabel, MdTabContent, MdTab]; - +const TABS_INTERNAL_DIRECTIVES = [MdInkBar, MdTabLabelWrapper]; @NgModule({ imports: [CommonModule, PortalModule], - exports: MD_TABS_DIRECTIVES, - declarations: MD_TABS_DIRECTIVES, + exports: [MD_TABS_DIRECTIVES], + declarations: [MD_TABS_DIRECTIVES, TABS_INTERNAL_DIRECTIVES], }) export class MdTabsModule { } diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts index e4cf1a652db0..ef20dee089dc 100644 --- a/src/demo-app/system-config.ts +++ b/src/demo-app/system-config.ts @@ -3,7 +3,6 @@ **********************************************************************************************/ const components = [ - 'all', 'button', 'card', 'checkbox', @@ -29,7 +28,7 @@ const components = [ const map: any = { '@angular2-material/core': 'core', }; -components.forEach(name => {map[`@angular2-material/${name}`] = `components/${name}`; console.log(name)}); +components.forEach(name => map[`@angular2-material/${name}`] = `components/${name}`); /** User packages configuration. */ From 7024d515eea3eb38599bc134fa85cdafd6aceebb Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Thu, 28 Jul 2016 18:20:34 -0700 Subject: [PATCH 03/23] fix broken tests due to bad module definitions --- src/components/dialog/dialog.spec.ts | 35 +++++---------------- src/components/menu/menu.spec.ts | 2 +- src/components/tabs/tab-group.spec.ts | 3 +- src/components/tooltip/tooltip.spec.ts | 27 +++++++++------- src/core/a11y/live-announcer.spec.ts | 12 ++++--- src/core/overlay/overlay-directives.spec.ts | 30 +++++++++--------- src/core/overlay/overlay.spec.ts | 31 ++++++------------ src/core/overlay/overlay.ts | 2 -- src/core/portal/portal.spec.ts | 15 ++++++++- 9 files changed, 71 insertions(+), 86 deletions(-) diff --git a/src/components/dialog/dialog.spec.ts b/src/components/dialog/dialog.spec.ts index 3e1b222e43d6..fc5254ca61b6 100644 --- a/src/components/dialog/dialog.spec.ts +++ b/src/components/dialog/dialog.spec.ts @@ -34,41 +34,20 @@ describe('MdDialog', () => { beforeEach(async(() => { configureModule({ imports: [MdDialogModule], - declarations: TEST_DIRECTIVES, - entryComponents: TEST_DIRECTIVES, + declarations: [TEST_COMPONENTS, DirectiveWithViewContainer], + entryComponents: TEST_COMPONENTS, }); addProviders([ {provide: OverlayContainer, useFactory: () => { - return { - getContainerElement: () => { - if (overlayContainerElement) { return overlayContainerElement; } - overlayContainerElement = document.createElement('div'); - return overlayContainerElement; - } - }; + overlayContainerElement = document.createElement('div'); + return {getContainerElement: () => overlayContainerElement}; }} - ]) + ]); doAsyncEntryPointCompilation(); })); - - beforeEach(() => { - addProviders([ - OVERLAY_PROVIDERS, - MdDialog, - {provide: OverlayContainer, useFactory: () => { - return { - getContainerElement: () => { - overlayContainerElement = document.createElement('div'); - return overlayContainerElement; - } - }; - }}, - ]); - }); - let deps = [TestComponentBuilder, MdDialog]; beforeEach(inject(deps, fakeAsync((tcb: TestComponentBuilder, d: MdDialog) => { builder = tcb; @@ -148,7 +127,7 @@ function detectChangesForDialogOpen(fixture: ComponentFixture fixture.detectChanges(), 50); + setTimeout(() => fixture.detectChanges(), 150); } @Directive({selector: 'dir-with-view-container'}) @@ -180,4 +159,4 @@ class PizzaMsg { } -const TEST_DIRECTIVES = [PizzaMsg, ComponentWithChildViewContainer, DirectiveWithViewContainer]; +const TEST_COMPONENTS = [PizzaMsg, ComponentWithChildViewContainer]; diff --git a/src/components/menu/menu.spec.ts b/src/components/menu/menu.spec.ts index 840e38ac3e90..02407b069140 100644 --- a/src/components/menu/menu.spec.ts +++ b/src/components/menu/menu.spec.ts @@ -6,7 +6,7 @@ import { async, } from '@angular/core/testing'; import {Component} from '@angular/core'; -import {MD_MENU_DIRECTIVES, MdMenuModule} from './menu'; +import {MdMenuModule} from './menu'; describe('MdMenu', () => { let builder: TestComponentBuilder; diff --git a/src/components/tabs/tab-group.spec.ts b/src/components/tabs/tab-group.spec.ts index bbe0cbaf703b..4277eab1ee7f 100644 --- a/src/components/tabs/tab-group.spec.ts +++ b/src/components/tabs/tab-group.spec.ts @@ -74,7 +74,7 @@ describe('MdTabGroup', () => { }); })); - xit('should cycle tab focus with focusNextTab/focusPreviousTab functions', fakeAsync(() => { + it('should cycle tab focus with focusNextTab/focusPreviousTab functions', fakeAsync(() => { let testComponent = fixture.componentInstance; let tabComponent = fixture.debugElement.query(By.css('md-tab-group')).componentInstance; @@ -156,6 +156,7 @@ describe('MdTabGroup', () => { builder.createAsync(AsyncTabsTestApp).then(f => fixture = f); })); + // HERE it('should show tabs when they are available', async(() => { let labels = fixture.debugElement.queryAll(By.css('.md-tab-label')); diff --git a/src/components/tooltip/tooltip.spec.ts b/src/components/tooltip/tooltip.spec.ts index e7eae09919b8..fbe7cf48fba7 100644 --- a/src/components/tooltip/tooltip.spec.ts +++ b/src/components/tooltip/tooltip.spec.ts @@ -4,6 +4,8 @@ import { addProviders, TestComponentBuilder, ComponentFixture, + configureModule, + doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -11,25 +13,28 @@ import {MD_TOOLTIP_DIRECTIVES, TooltipPosition, MdTooltip} from '@angular2-material/tooltip/tooltip'; import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay'; import {OverlayContainer} from '@angular2-material/core/overlay/overlay-container'; +import {MdTooltipModule} from './tooltip'; describe('MdTooltip', () => { let builder: TestComponentBuilder; let overlayContainerElement: HTMLElement; - beforeEach(() => { + beforeEach(async(() => { + configureModule({ + imports: [MdTooltipModule], + declarations: [BasicTooltipDemo], + entryComponents: [BasicTooltipDemo], + }); + addProviders([ - OVERLAY_PROVIDERS, {provide: OverlayContainer, useFactory: () => { - return { - getContainerElement: () => { - if (overlayContainerElement) { return overlayContainerElement; } - overlayContainerElement = document.createElement('div'); - return overlayContainerElement; - } - }; - }}, + overlayContainerElement = document.createElement('div'); + return {getContainerElement: () => overlayContainerElement}; + }} ]); - }); + + doAsyncEntryPointCompilation(); + })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; diff --git a/src/core/a11y/live-announcer.spec.ts b/src/core/a11y/live-announcer.spec.ts index 620e486b67a1..f9de2b55957c 100644 --- a/src/core/a11y/live-announcer.spec.ts +++ b/src/core/a11y/live-announcer.spec.ts @@ -6,6 +6,7 @@ import { addProviders, TestComponentBuilder, ComponentFixture, + configureModule, } from '@angular/core/testing'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -17,9 +18,11 @@ describe('MdLiveAnnouncer', () => { let liveEl: Element; describe('with default element', () => { - beforeEach(() => { - addProviders([MdLiveAnnouncer]); - }); + beforeEach(() => configureModule({ + declarations: [TestApp], + entryComponents: [TestApp], + providers: [MdLiveAnnouncer] + })); beforeEach(inject([TestComponentBuilder, MdLiveAnnouncer], (tcb: TestComponentBuilder, _live: MdLiveAnnouncer) => { @@ -137,8 +140,7 @@ function getLiveElement(): Element { }) class TestApp { - constructor(private live: MdLiveAnnouncer) { - }; + constructor(private live: MdLiveAnnouncer) { }; announceText(message: string) { this.live.announce(message); diff --git a/src/core/overlay/overlay-directives.spec.ts b/src/core/overlay/overlay-directives.spec.ts index c2cf7d5971c3..e911c6c6979f 100644 --- a/src/core/overlay/overlay-directives.spec.ts +++ b/src/core/overlay/overlay-directives.spec.ts @@ -6,35 +6,33 @@ import { addProviders, TestComponentBuilder, ComponentFixture, + configureModule, } from '@angular/core/testing'; import {Component, ViewChild} from '@angular/core'; -import {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives'; -import {Overlay} from './overlay'; +import {ConnectedOverlayDirective, OverlayModule} from './overlay-directives'; import {OverlayContainer} from './overlay-container'; -import {ViewportRuler} from './position/viewport-ruler'; -import {OverlayPositionBuilder} from './position/overlay-position-builder'; import {ConnectedPositionStrategy} from './position/connected-position-strategy'; + describe('Overlay directives', () => { let builder: TestComponentBuilder; let overlayContainerElement: HTMLElement; let fixture: ComponentFixture; - beforeEach(() => { + beforeEach(async(() => { + configureModule({ + imports: [OverlayModule], + declarations: [ConnectedOverlayDirectiveTest], + entryComponents: [ConnectedOverlayDirectiveTest], + }); + addProviders([ - Overlay, - OverlayPositionBuilder, - ViewportRuler, {provide: OverlayContainer, useFactory: () => { - return { - getContainerElement: () => { - overlayContainerElement = document.createElement('div'); - return overlayContainerElement; - } - }; - }}, + overlayContainerElement = document.createElement('div'); + return {getContainerElement: () => overlayContainerElement}; + }} ]); - }); + })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; diff --git a/src/core/overlay/overlay.spec.ts b/src/core/overlay/overlay.spec.ts index f6fbe0035f7c..23717d131a58 100644 --- a/src/core/overlay/overlay.spec.ts +++ b/src/core/overlay/overlay.spec.ts @@ -8,15 +8,13 @@ import { async, } from '@angular/core/testing'; import {Component, ViewChild, ViewContainerRef} from '@angular/core'; -import {TemplatePortalDirective} from '../portal/portal-directives'; +import {TemplatePortalDirective, PortalModule} from '../portal/portal-directives'; import {TemplatePortal, ComponentPortal} from '../portal/portal'; import {Overlay} from './overlay'; import {OverlayContainer} from './overlay-container'; import {OverlayRef} from './overlay-ref'; import {OverlayState} from './overlay-state'; import {PositionStrategy} from './position/position-strategy'; -import {OverlayPositionBuilder} from './position/overlay-position-builder'; -import {ViewportRuler} from './position/viewport-ruler'; import {OverlayModule} from './overlay-directives'; @@ -29,25 +27,16 @@ describe('Overlay', () => { beforeEach(async(() => { configureModule({ - imports: [OverlayModule], + imports: [OverlayModule, PortalModule], declarations: TEST_COMPONENTS, entryComponents: TEST_COMPONENTS, + providers: [ + {provide: OverlayContainer, useFactory: () => { + overlayContainerElement = document.createElement('div'); + return {getContainerElement: () => overlayContainerElement}; + }} + ] }); - - addProviders([ - Overlay, - OverlayPositionBuilder, - ViewportRuler, - {provide: OverlayContainer, useFactory: () => { - return { - getContainerElement: () => { - if (overlayContainerElement) { return overlayContainerElement; } - overlayContainerElement = document.createElement('div'); - return overlayContainerElement; - } - }; - }} - ]) })); @@ -82,7 +71,7 @@ describe('Overlay', () => { expect(overlayContainerElement.textContent).toBe(''); })); - xit('should load a template portal into an overlay', fakeAsync(() => { + it('should load a template portal into an overlay', fakeAsync(() => { let overlayRef: OverlayRef; overlay.create().then(ref => { @@ -99,7 +88,7 @@ describe('Overlay', () => { expect(overlayContainerElement.textContent).toBe(''); })); - xit('should open multiple overlays', fakeAsync(() => { + it('should open multiple overlays', fakeAsync(() => { let pizzaOverlayRef: OverlayRef; let cakeOverlayRef: OverlayRef; diff --git a/src/core/overlay/overlay.ts b/src/core/overlay/overlay.ts index 189202ea43bf..e35b94ef6fe6 100644 --- a/src/core/overlay/overlay.ts +++ b/src/core/overlay/overlay.ts @@ -1,5 +1,4 @@ import { - NgModule, ComponentResolver, Injectable, } from '@angular/core'; @@ -10,7 +9,6 @@ import {OverlayRef} from './overlay-ref'; import {OverlayPositionBuilder} from './position/overlay-position-builder'; import {ViewportRuler} from './position/viewport-ruler'; import {OverlayContainer} from './overlay-container'; -import {PortalModule} from '../portal/portal-directives'; /** Next overlay unique ID. */ let nextUniqueId = 0; diff --git a/src/core/portal/portal.spec.ts b/src/core/portal/portal.spec.ts index dde7f1ed2554..f9104cfc5030 100644 --- a/src/core/portal/portal.spec.ts +++ b/src/core/portal/portal.spec.ts @@ -4,6 +4,8 @@ import { flushMicrotasks, TestComponentBuilder, ComponentFixture, + configureModule, + async, } from '@angular/core/testing'; import { Component, @@ -14,7 +16,7 @@ import { Optional, Injector, } from '@angular/core'; -import {TemplatePortalDirective, PortalHostDirective} from './portal-directives'; +import {TemplatePortalDirective, PortalHostDirective, PortalModule} from './portal-directives'; import {Portal, ComponentPortal} from './portal'; import {DomPortalHost} from './dom-portal-host'; @@ -22,6 +24,14 @@ import {DomPortalHost} from './dom-portal-host'; describe('Portals', () => { let builder: TestComponentBuilder; + beforeEach(async(() => { + configureModule({ + imports: [PortalModule], + declarations: TEST_COMPONENTS, + entryComponents: TEST_COMPONENTS, + }); + })); + beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; })); @@ -435,3 +445,6 @@ class PortalTestApp { return this.portals.toArray()[2]; } } + + +const TEST_COMPONENTS = [PortalTestApp, ArbitraryViewContainerRefComponent, PizzaMsg]; From dd17561155b43f2bc2b9d1cda2d3ac0d34886279 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Fri, 29 Jul 2016 11:25:17 -0700 Subject: [PATCH 04/23] fix weird async errors --- src/components/menu/menu.spec.ts | 11 +++++------ src/components/tabs/tab-group.spec.ts | 13 +++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/menu/menu.spec.ts b/src/components/menu/menu.spec.ts index 02407b069140..c3b8bb8b4720 100644 --- a/src/components/menu/menu.spec.ts +++ b/src/components/menu/menu.spec.ts @@ -25,13 +25,12 @@ describe('MdMenu', () => { builder = tcb; })); - it('should add and remove focus class on focus/blur', () => { + it('should add and remove focus class on focus/blur', async(() => { var template = ``; - return builder.overrideTemplate(TestList, template) - .createAsync(TestList).then((fixture) => { - expect(true).toBe(true); - }); - }); + builder.overrideTemplate(TestList, template).createAsync(TestList).then(fixture => { + expect(true).toBe(true); + }); + })); }); diff --git a/src/components/tabs/tab-group.spec.ts b/src/components/tabs/tab-group.spec.ts index 4277eab1ee7f..79e3d730c015 100644 --- a/src/components/tabs/tab-group.spec.ts +++ b/src/components/tabs/tab-group.spec.ts @@ -13,6 +13,7 @@ import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; import {Observable} from 'rxjs/Observable'; + describe('MdTabGroup', () => { let builder: TestComponentBuilder; @@ -39,11 +40,11 @@ describe('MdTabGroup', () => { }); })); - it('should default to the first tab', () => { + it('should default to the first tab', async(() => { checkSelectedIndex(1, fixture); - }); + })); - it('should change selected index on click', () => { + it('should change selected index on click', async(() => { let component = fixture.debugElement.componentInstance; component.selectedIndex = 0; checkSelectedIndex(0, fixture); @@ -57,7 +58,7 @@ describe('MdTabGroup', () => { tabLabel = fixture.debugElement.queryAll(By.css('.md-tab-label'))[2]; tabLabel.nativeElement.click(); checkSelectedIndex(2, fixture); - }); + })); it('should support two-way binding for selectedIndex', async(() => { let component = fixture.componentInstance; @@ -156,7 +157,6 @@ describe('MdTabGroup', () => { builder.createAsync(AsyncTabsTestApp).then(f => fixture = f); })); - // HERE it('should show tabs when they are available', async(() => { let labels = fixture.debugElement.queryAll(By.css('.md-tab-label')); @@ -246,7 +246,8 @@ class AsyncTabsTestApp { tabs: Observable; - constructor() { + // Use ngOnInit because there is some issue with scheduling the async task in the constructor. + ngOnInit() { this.tabs = Observable.create((observer: any) => { requestAnimationFrame(() => observer.next(this._tabs)); }); From 3bddddbd6d60b8d5c5d6d8a10efcfe5af2807ad6 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Fri, 29 Jul 2016 12:47:55 -0700 Subject: [PATCH 05/23] version bump --- package.json | 2 +- scripts/release/stage-release.sh | 5 +++++ src/components/button-toggle/button-toggle.ts | 2 +- src/components/button/button.ts | 4 ++-- src/components/button/package.json | 4 ++-- src/components/card/card.ts | 6 +++--- src/components/card/package.json | 4 ++-- src/components/checkbox/checkbox.ts | 2 +- src/components/checkbox/package.json | 4 ++-- src/components/dialog/dialog-container.ts | 2 +- src/components/grid-list/grid-list.ts | 2 +- src/components/grid-list/grid-tile.ts | 4 ++-- src/components/grid-list/package.json | 4 ++-- src/components/icon/icon.ts | 2 +- src/components/icon/package.json | 4 ++-- src/components/input/input.ts | 2 +- src/components/input/package.json | 4 ++-- src/components/list/list.ts | 4 ++-- src/components/list/package.json | 4 ++-- src/components/menu/menu-directive.ts | 2 +- src/components/menu/package.json | 4 ++-- src/components/progress-bar/package.json | 4 ++-- src/components/progress-bar/progress-bar.ts | 2 +- src/components/progress-circle/package.json | 4 ++-- src/components/progress-circle/progress-circle.ts | 4 ++-- src/components/radio/package.json | 4 ++-- src/components/radio/radio.ts | 2 +- src/components/sidenav/package.json | 4 ++-- src/components/sidenav/sidenav.ts | 2 +- src/components/slide-toggle/package.json | 4 ++-- src/components/slide-toggle/slide-toggle.ts | 2 +- src/components/slider/slider.ts | 2 +- src/components/tabs/package.json | 4 ++-- src/components/tabs/tabs.ts | 2 +- src/components/toolbar/package.json | 4 ++-- src/components/toolbar/toolbar.ts | 2 +- src/components/tooltip/tooltip.ts | 2 +- src/core/package.json | 2 +- src/demo-app/baseline/baseline-demo.ts | 2 +- src/demo-app/button-toggle/button-toggle-demo.ts | 6 +----- src/demo-app/button/button-demo.ts | 2 +- src/demo-app/card/card-demo.ts | 2 +- src/demo-app/checkbox/checkbox-demo.ts | 4 ++-- src/demo-app/demo-app/demo-app.ts | 2 +- src/demo-app/dialog/dialog-demo.ts | 2 +- src/demo-app/gestures/gestures-demo.ts | 2 +- src/demo-app/grid-list/grid-list-demo.ts | 2 +- src/demo-app/icon/icon-demo.ts | 2 +- src/demo-app/input/input-demo.ts | 2 +- src/demo-app/list/list-demo.ts | 2 +- src/demo-app/live-announcer/live-announcer-demo.ts | 2 +- src/demo-app/main.ts | 1 - src/demo-app/menu/menu-demo.ts | 2 +- src/demo-app/overlay/overlay-demo.ts | 4 ++-- src/demo-app/portal/portal-demo.ts | 4 ++-- src/demo-app/progress-bar/progress-bar-demo.ts | 2 +- src/demo-app/progress-circle/progress-circle-demo.ts | 2 +- src/demo-app/radio/radio-demo.ts | 2 +- src/demo-app/ripple/ripple-demo.ts | 2 +- src/demo-app/sidenav/sidenav-demo.ts | 2 +- src/demo-app/slide-toggle/slide-toggle-demo.ts | 2 +- src/demo-app/slider/slider-demo.ts | 2 +- src/demo-app/tabs/tab-group-demo.ts | 2 +- src/demo-app/toolbar/toolbar-demo.ts | 2 +- src/demo-app/tooltip/tooltip-demo.ts | 2 +- src/e2e-app/button/button-e2e.ts | 2 +- src/e2e-app/e2e-app/e2e-app.ts | 2 +- src/e2e-app/icon/icon-e2e.ts | 2 +- src/e2e-app/menu/menu-e2e.ts | 2 +- src/e2e-app/tabs/tabs-e2e.ts | 2 +- 70 files changed, 97 insertions(+), 97 deletions(-) diff --git a/package.json b/package.json index 1d50ce46ca9f..bb1861fe4536 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "deploy": "firebase deploy", "webdriver-manager": "webdriver-manager" }, - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "license": "MIT", "engines": { "node": ">= 4.2.1 < 5" diff --git a/scripts/release/stage-release.sh b/scripts/release/stage-release.sh index 8f260ba3eedf..c5c412197d2e 100755 --- a/scripts/release/stage-release.sh +++ b/scripts/release/stage-release.sh @@ -22,11 +22,16 @@ ng build # distinguishing marker and then undoing those lines after we've generated the .metadata.json files. grep -lr "moduleId:" ./src/ | xargs sed -i 's|moduleId:|//MODULE moduleId:|g' + +sleep 1 + # Run tsc directly first so that the output directories match what ngc is expecting. This is # different from what the CLI will output for *demo-app*, but we don't care about the output for # demo-app when we're staging a release (only components/ and core/). tsc -p ./src/demo-app +exit 0 + # Now run ngc to generate the .metadata.json files. Our tsconfig is configred with # skipTemplateCodegen, so only the metadata files are actually generated. ./node_modules/.bin/ngc -p ./src/demo-app diff --git a/src/components/button-toggle/button-toggle.ts b/src/components/button-toggle/button-toggle.ts index ffe9da869d94..d72153cb19a2 100644 --- a/src/components/button-toggle/button-toggle.ts +++ b/src/components/button-toggle/button-toggle.ts @@ -209,7 +209,7 @@ export class MdButtonToggleGroupMultiple { } @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-button-toggle', templateUrl: 'button-toggle.html', styleUrls: ['button-toggle.css'], diff --git a/src/components/button/button.ts b/src/components/button/button.ts index 5c519e047c63..874aead622ba 100644 --- a/src/components/button/button.ts +++ b/src/components/button/button.ts @@ -16,7 +16,7 @@ import { @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'button[md-button], button[md-raised-button], button[md-icon-button], ' + 'button[md-fab], button[md-mini-fab]', inputs: ['color'], @@ -86,7 +86,7 @@ export class MdButton { } @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'a[md-button], a[md-raised-button], a[md-icon-button], a[md-fab], a[md-mini-fab]', inputs: ['color'], host: { diff --git a/src/components/button/package.json b/src/components/button/package.json index f10f63c23749..49b8ff7e3946 100644 --- a/src/components/button/package.json +++ b/src/components/button/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/button", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material button", "main": "./button.js", "typings": "./button.d.ts", @@ -23,6 +23,6 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/card/card.ts b/src/components/card/card.ts index a3dc9e0c54b7..ea54f716994f 100644 --- a/src/components/card/card.ts +++ b/src/components/card/card.ts @@ -21,7 +21,7 @@ it also provides a number of preset styles for common card sections, including: */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-card', templateUrl: 'card.html', styleUrls: ['card.css'], @@ -46,7 +46,7 @@ TODO(kara): update link to demo site when it exists */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-card-header', templateUrl: 'card-header.html', encapsulation: ViewEncapsulation.None, @@ -66,7 +66,7 @@ TODO(kara): update link to demo site when it exists */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-card-title-group', templateUrl: 'card-title-group.html', encapsulation: ViewEncapsulation.None, diff --git a/src/components/card/package.json b/src/components/card/package.json index bff6f11c014a..ba280edd15d8 100644 --- a/src/components/card/package.json +++ b/src/components/card/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/card", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material card", "main": "./card.js", "typings": "./card.d.ts", @@ -21,6 +21,6 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/checkbox/checkbox.ts b/src/components/checkbox/checkbox.ts index 9a14b7c1cb80..3939c927e180 100644 --- a/src/components/checkbox/checkbox.ts +++ b/src/components/checkbox/checkbox.ts @@ -56,7 +56,7 @@ export class MdCheckboxChange { * See: https://www.google.com/design/spec/components/selection-controls.html */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-checkbox', templateUrl: 'checkbox.html', styleUrls: ['checkbox.css'], diff --git a/src/components/checkbox/package.json b/src/components/checkbox/package.json index 8ba33d19900b..7225e682e764 100644 --- a/src/components/checkbox/package.json +++ b/src/components/checkbox/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/checkbox", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material checkbox", "main": "./checkbox.js", "typings": "./checkbox.d.ts", @@ -21,7 +21,7 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2", + "@angular2-material/core": "2.0.0-alpha.6-3", "@angular/forms": "^0.2.0" } } diff --git a/src/components/dialog/dialog-container.ts b/src/components/dialog/dialog-container.ts index 9c52e7ddf936..9a099771f95f 100644 --- a/src/components/dialog/dialog-container.ts +++ b/src/components/dialog/dialog-container.ts @@ -14,7 +14,7 @@ import {MdDialogContentAlreadyAttachedError} from './dialog-errors'; * Internal component that wraps user-provided dialog content. */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-dialog-container', templateUrl: 'dialog-container.html', styleUrls: ['dialog-container.css'], diff --git a/src/components/grid-list/grid-list.ts b/src/components/grid-list/grid-list.ts index b7ffd0675591..eefa969ac322 100644 --- a/src/components/grid-list/grid-list.ts +++ b/src/components/grid-list/grid-list.ts @@ -31,7 +31,7 @@ import {coerceToString, coerceToNumber} from './grid-list-measure'; const MD_FIT_MODE = 'fit'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-grid-list', templateUrl: 'grid-list.html', styleUrls: ['grid-list.css'], diff --git a/src/components/grid-list/grid-tile.ts b/src/components/grid-list/grid-tile.ts index f6e5aa00577d..43bd6b6e8129 100644 --- a/src/components/grid-list/grid-tile.ts +++ b/src/components/grid-list/grid-tile.ts @@ -12,7 +12,7 @@ import { MdLine, MdLineSetter } from '@angular2-material/core/line/line'; import {coerceToNumber} from './grid-list-measure'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-grid-tile', host: { 'role': 'listitem' }, templateUrl: 'grid-tile.html', @@ -54,7 +54,7 @@ export class MdGridTile { } @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-grid-tile-header, md-grid-tile-footer', templateUrl: 'grid-tile-text.html' }) diff --git a/src/components/grid-list/package.json b/src/components/grid-list/package.json index 78eadffb7909..41f426371ed7 100644 --- a/src/components/grid-list/package.json +++ b/src/components/grid-list/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/grid-list", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material grid list", "main": "./grid-list.js", "typings": "./grid-list.d.ts", @@ -23,6 +23,6 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/icon/icon.ts b/src/components/icon/icon.ts index ca35da9817df..086b10bbc0f3 100644 --- a/src/components/icon/icon.ts +++ b/src/components/icon/icon.ts @@ -58,7 +58,7 @@ export class MdIconInvalidNameError extends MdError { * */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, template: '', selector: 'md-icon', styleUrls: ['icon.css'], diff --git a/src/components/icon/package.json b/src/components/icon/package.json index ec7fd216368b..a724e61e860a 100644 --- a/src/components/icon/package.json +++ b/src/components/icon/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/icon", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material icon", "main": "./icon.js", "typings": "./icon.d.ts", @@ -22,6 +22,6 @@ "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { "@angular/http": "2.0.0-rc.4", - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/input/input.ts b/src/components/input/input.ts index 3e505dc811b4..a481010fa90d 100644 --- a/src/components/input/input.ts +++ b/src/components/input/input.ts @@ -95,7 +95,7 @@ export class MdHint { * improve on its behaviour, along with styling it according to the Material Design. */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-input', templateUrl: 'input.html', styleUrls: ['input.css'], diff --git a/src/components/input/package.json b/src/components/input/package.json index a046d9ffeb1c..6a516a82b7de 100644 --- a/src/components/input/package.json +++ b/src/components/input/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/input", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material input", "main": "./input.js", "typings": "./input.d.ts", @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2", + "@angular2-material/core": "2.0.0-alpha.6-3", "@angular/forms": "^0.2.0" } } diff --git a/src/components/list/list.ts b/src/components/list/list.ts index 2768e7a95bbf..dfdb01129a13 100644 --- a/src/components/list/list.ts +++ b/src/components/list/list.ts @@ -13,7 +13,7 @@ import { import {MdLine, MdLineSetter, MdLineModule} from '@angular2-material/core/line/line'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-list, md-nav-list', host: {'role': 'list'}, template: '', @@ -27,7 +27,7 @@ export class MdList {} export class MdListAvatar {} @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-list-item, a[md-list-item]', host: { 'role': 'listitem', diff --git a/src/components/list/package.json b/src/components/list/package.json index 5efc92fc2e1f..efda85807729 100644 --- a/src/components/list/package.json +++ b/src/components/list/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/list", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material list", "main": "./list.js", "typings": "./list.d.ts", @@ -21,6 +21,6 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/menu/menu-directive.ts b/src/components/menu/menu-directive.ts index bac6f9181a1c..1a7191278745 100644 --- a/src/components/menu/menu-directive.ts +++ b/src/components/menu/menu-directive.ts @@ -15,7 +15,7 @@ import {MenuPositionX, MenuPositionY} from './menu-positions'; import {MdMenuInvalidPositionX, MdMenuInvalidPositionY} from './menu-errors'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-menu', host: {'role': 'menu'}, templateUrl: 'menu.html', diff --git a/src/components/menu/package.json b/src/components/menu/package.json index 8425975e8f48..b0cbeb8cc024 100644 --- a/src/components/menu/package.json +++ b/src/components/menu/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/menu", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material menu", "main": "./menu.js", "typings": "./menu.d.ts", @@ -21,6 +21,6 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/progress-bar/package.json b/src/components/progress-bar/package.json index cd9b6d6e6b08..dad63f4e6838 100644 --- a/src/components/progress-bar/package.json +++ b/src/components/progress-bar/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/progress-bar", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material progress-bar", "main": "./progress-bar.js", "typings": "./progress-bar.d.ts", @@ -23,6 +23,6 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/progress-bar/progress-bar.ts b/src/components/progress-bar/progress-bar.ts index e405d9e7c7b1..cc7dba748729 100644 --- a/src/components/progress-bar/progress-bar.ts +++ b/src/components/progress-bar/progress-bar.ts @@ -15,7 +15,7 @@ import {CommonModule} from '@angular/common'; * component. */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-progress-bar', host: { 'role': 'progressbar', diff --git a/src/components/progress-circle/package.json b/src/components/progress-circle/package.json index ca53a0c40a92..9e4fa88dec49 100644 --- a/src/components/progress-circle/package.json +++ b/src/components/progress-circle/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/progress-circle", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material progress-circle", "main": "./progress-circle.js", "typings": "./progress-circle.d.ts", @@ -22,6 +22,6 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/progress-circle/progress-circle.ts b/src/components/progress-circle/progress-circle.ts index 859dd6d9d489..ba2d2b153fcf 100644 --- a/src/components/progress-circle/progress-circle.ts +++ b/src/components/progress-circle/progress-circle.ts @@ -32,7 +32,7 @@ type EasingFn = (currentTime: number, startValue: number, * component. */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-progress-circle', host: { 'role': 'progressbar', @@ -219,7 +219,7 @@ export class MdProgressCircle implements OnDestroy { * indeterminate instance. */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-spinner', host: { 'role': 'progressbar', diff --git a/src/components/radio/package.json b/src/components/radio/package.json index 60c1f7875d6d..55860b287be3 100644 --- a/src/components/radio/package.json +++ b/src/components/radio/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/radio", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material radio", "main": "./radio.js", "typings": "./radio.d.ts", @@ -21,7 +21,7 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2", + "@angular2-material/core": "2.0.0-alpha.6-3", "@angular/forms": "^0.2.0" } } diff --git a/src/components/radio/radio.ts b/src/components/radio/radio.ts index eee7e82fc11f..e8d4e42ff0e6 100644 --- a/src/components/radio/radio.ts +++ b/src/components/radio/radio.ts @@ -234,7 +234,7 @@ export class MdRadioGroup implements AfterContentInit, ControlValueAccessor { @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-radio-button', templateUrl: 'radio.html', styleUrls: ['radio.css'], diff --git a/src/components/sidenav/package.json b/src/components/sidenav/package.json index 46bcf52bdf13..9dc6e7e6b759 100644 --- a/src/components/sidenav/package.json +++ b/src/components/sidenav/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/sidenav", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material sidenav", "main": "./sidenav.js", "typings": "./sidenav.d.ts", @@ -24,6 +24,6 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/sidenav/sidenav.ts b/src/components/sidenav/sidenav.ts index 7cfbbaf2105d..8f71650f1b6c 100644 --- a/src/components/sidenav/sidenav.ts +++ b/src/components/sidenav/sidenav.ts @@ -222,7 +222,7 @@ export class MdSidenav { * and coordinate the backdrop and content styling. */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-sidenav-layout', // Do not use ChangeDetectionStrategy.OnPush. It does not work for this component because // technically it is a sibling of MdSidenav (on the content tree) and isn't updated when MdSidenav diff --git a/src/components/slide-toggle/package.json b/src/components/slide-toggle/package.json index 58238c807faa..78ae326d2c21 100644 --- a/src/components/slide-toggle/package.json +++ b/src/components/slide-toggle/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/slide-toggle", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material Slide Toggle", "main": "./slide-toggle.js", "typings": "./slide-toggle.d.ts", @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2", + "@angular2-material/core": "2.0.0-alpha.6-3", "@angular/forms": "^0.2.0" } } diff --git a/src/components/slide-toggle/slide-toggle.ts b/src/components/slide-toggle/slide-toggle.ts index 1cc5c744c9c6..8116866c8049 100644 --- a/src/components/slide-toggle/slide-toggle.ts +++ b/src/components/slide-toggle/slide-toggle.ts @@ -35,7 +35,7 @@ export class MdSlideToggleChange { let nextId = 0; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-slide-toggle', host: { '[class.md-checked]': 'checked', diff --git a/src/components/slider/slider.ts b/src/components/slider/slider.ts index 3bc3e87deb9e..e93686404d58 100644 --- a/src/components/slider/slider.ts +++ b/src/components/slider/slider.ts @@ -11,7 +11,7 @@ import {BooleanFieldValue} from '@angular2-material/core/annotations/field-value import {applyCssTransform} from '@angular2-material/core/style/apply-transform'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-slider', host: { 'tabindex': '0', diff --git a/src/components/tabs/package.json b/src/components/tabs/package.json index 4d4b3c00b6bf..f7cd8655908e 100644 --- a/src/components/tabs/package.json +++ b/src/components/tabs/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/tabs", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material Tabs", "main": "./tabs.js", "typings": "./tabs.d.ts", @@ -21,6 +21,6 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts index 42e039faf45b..b975d7c3636c 100644 --- a/src/components/tabs/tabs.ts +++ b/src/components/tabs/tabs.ts @@ -51,7 +51,7 @@ export class MdTab { * See: https://www.google.com/design/spec/components/tabs.html */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-tab-group', templateUrl: 'tab-group.html', styleUrls: ['tab-group.css'], diff --git a/src/components/toolbar/package.json b/src/components/toolbar/package.json index ec3f248da879..a7847f5eaa51 100644 --- a/src/components/toolbar/package.json +++ b/src/components/toolbar/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/toolbar", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material toolbar", "main": "./toolbar.js", "typings": "./toolbar.d.ts", @@ -22,6 +22,6 @@ }, "homepage": "https://github.com/angular/material2#readme", "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.6-2" + "@angular2-material/core": "2.0.0-alpha.6-3" } } diff --git a/src/components/toolbar/toolbar.ts b/src/components/toolbar/toolbar.ts index 52d0c605da08..1d04b2548722 100644 --- a/src/components/toolbar/toolbar.ts +++ b/src/components/toolbar/toolbar.ts @@ -9,7 +9,7 @@ import {Renderer} from '@angular/core'; import {ElementRef} from '@angular/core'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-toolbar', templateUrl: 'toolbar.html', styleUrls: ['toolbar.css'], diff --git a/src/components/tooltip/tooltip.ts b/src/components/tooltip/tooltip.ts index 34616c62471f..0d0707207d7b 100644 --- a/src/components/tooltip/tooltip.ts +++ b/src/components/tooltip/tooltip.ts @@ -182,7 +182,7 @@ export class MdTooltip { } @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-tooltip-component', template: `
{{message}}
`, styleUrls: ['tooltip.css'], diff --git a/src/core/package.json b/src/core/package.json index d9a056f384f2..525d30771797 100644 --- a/src/core/package.json +++ b/src/core/package.json @@ -1,6 +1,6 @@ { "name": "@angular2-material/core", - "version": "2.0.0-alpha.6-2", + "version": "2.0.0-alpha.6-3", "description": "Angular 2 Material core", "main": "./core.js", "typings": "./core.d.ts", diff --git a/src/demo-app/baseline/baseline-demo.ts b/src/demo-app/baseline/baseline-demo.ts index 7f571c6dd9e9..e99a680ebaad 100644 --- a/src/demo-app/baseline/baseline-demo.ts +++ b/src/demo-app/baseline/baseline-demo.ts @@ -13,7 +13,7 @@ import { @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'baseline-demo', templateUrl: 'baseline-demo.html', styleUrls: ['baseline-demo.css'], diff --git a/src/demo-app/button-toggle/button-toggle-demo.ts b/src/demo-app/button-toggle/button-toggle-demo.ts index ccd14468858a..82589615310c 100644 --- a/src/demo-app/button-toggle/button-toggle-demo.ts +++ b/src/demo-app/button-toggle/button-toggle-demo.ts @@ -1,14 +1,10 @@ import {Component} from '@angular/core'; -import {NgFor} from '@angular/common'; -import {FORM_DIRECTIVES} from '@angular/forms'; -import {MD_BUTTON_TOGGLE_DIRECTIVES} from '@angular2-material/button-toggle/button-toggle'; import { MdUniqueSelectionDispatcher } from '@angular2-material/core/coordination/unique-selection-dispatcher'; -import {MdIcon} from '@angular2-material/icon/icon'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'button-toggle-demo', templateUrl: 'button-toggle-demo.html', providers: [MdUniqueSelectionDispatcher], diff --git a/src/demo-app/button/button-demo.ts b/src/demo-app/button/button-demo.ts index 47e77f4f3d9e..7767010d9781 100644 --- a/src/demo-app/button/button-demo.ts +++ b/src/demo-app/button/button-demo.ts @@ -3,7 +3,7 @@ import {MdButton, MdAnchor} from '@angular2-material/button/button'; import {MdIcon} from '@angular2-material/icon/icon'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'button-demo', templateUrl: 'button-demo.html', styleUrls: ['button-demo.css'], diff --git a/src/demo-app/card/card-demo.ts b/src/demo-app/card/card-demo.ts index 47ee16f0b645..03ae76d44c59 100644 --- a/src/demo-app/card/card-demo.ts +++ b/src/demo-app/card/card-demo.ts @@ -3,7 +3,7 @@ import {MdButton} from '@angular2-material/button/button'; import {MD_CARD_DIRECTIVES} from '@angular2-material/card/card'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'card-demo', templateUrl: 'card-demo.html', styleUrls: ['card-demo.css'], diff --git a/src/demo-app/checkbox/checkbox-demo.ts b/src/demo-app/checkbox/checkbox-demo.ts index cb7b9605ba4e..d1b9bb5a8845 100644 --- a/src/demo-app/checkbox/checkbox-demo.ts +++ b/src/demo-app/checkbox/checkbox-demo.ts @@ -10,7 +10,7 @@ export interface Task { } @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-checkbox-demo-nested-checklist', styles: [` li { @@ -59,7 +59,7 @@ export class MdCheckboxDemoNestedChecklist { } @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-checkbox-demo', templateUrl: 'checkbox-demo.html', styleUrls: ['checkbox-demo.css'], diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts index 86442e6e90e4..562f83ad32c8 100644 --- a/src/demo-app/demo-app/demo-app.ts +++ b/src/demo-app/demo-app/demo-app.ts @@ -11,7 +11,7 @@ import {Component, ViewEncapsulation} from '@angular/core'; export class Home {} @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'demo-app', providers: [], templateUrl: 'demo-app.html', diff --git a/src/demo-app/dialog/dialog-demo.ts b/src/demo-app/dialog/dialog-demo.ts index a52b699cfde4..3d20aebca901 100644 --- a/src/demo-app/dialog/dialog-demo.ts +++ b/src/demo-app/dialog/dialog-demo.ts @@ -3,7 +3,7 @@ import {MdDialog, MdDialogConfig, MdDialogRef} from '@angular2-material/dialog/d import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'dialog-demo', templateUrl: 'dialog-demo.html', styleUrls: ['dialog-demo.css'], diff --git a/src/demo-app/gestures/gestures-demo.ts b/src/demo-app/gestures/gestures-demo.ts index 13df7c29a2aa..c32e50e791c7 100644 --- a/src/demo-app/gestures/gestures-demo.ts +++ b/src/demo-app/gestures/gestures-demo.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'gestures-demo', templateUrl: 'gestures-demo.html', styleUrls: ['gestures-demo.css'], diff --git a/src/demo-app/grid-list/grid-list-demo.ts b/src/demo-app/grid-list/grid-list-demo.ts index e5dcae48b0eb..1f352ded3421 100644 --- a/src/demo-app/grid-list/grid-list-demo.ts +++ b/src/demo-app/grid-list/grid-list-demo.ts @@ -7,7 +7,7 @@ import {MD_CARD_DIRECTIVES} from '@angular2-material/card/card'; import {MdIcon, MdIconRegistry} from '@angular2-material/icon/icon'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'grid-list-demo', templateUrl: 'grid-list-demo.html', styleUrls: ['grid-list-demo.css'], diff --git a/src/demo-app/icon/icon-demo.ts b/src/demo-app/icon/icon-demo.ts index 23546d8d2af5..e36306cacc74 100644 --- a/src/demo-app/icon/icon-demo.ts +++ b/src/demo-app/icon/icon-demo.ts @@ -2,7 +2,7 @@ import {Component, ViewEncapsulation} from '@angular/core'; import {MdIcon, MdIconRegistry} from '@angular2-material/icon/icon'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'md-icon-demo', templateUrl: 'icon-demo.html', styleUrls: ['icon-demo.css'], diff --git a/src/demo-app/input/input-demo.ts b/src/demo-app/input/input-demo.ts index 0b15cdba8bff..a43b552d6caa 100644 --- a/src/demo-app/input/input-demo.ts +++ b/src/demo-app/input/input-demo.ts @@ -12,7 +12,7 @@ import {MdToolbar} from '@angular2-material/toolbar/toolbar'; let max = 5; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'input-demo', templateUrl: 'input-demo.html', styleUrls: ['input-demo.css'], diff --git a/src/demo-app/list/list-demo.ts b/src/demo-app/list/list-demo.ts index 50026b5d5146..7887b14dfa68 100644 --- a/src/demo-app/list/list-demo.ts +++ b/src/demo-app/list/list-demo.ts @@ -5,7 +5,7 @@ import {MD_LIST_DIRECTIVES} from '@angular2-material/list/list'; import {MdIcon} from '@angular2-material/icon/icon'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'list-demo', templateUrl: 'list-demo.html', styleUrls: ['list-demo.css'], diff --git a/src/demo-app/live-announcer/live-announcer-demo.ts b/src/demo-app/live-announcer/live-announcer-demo.ts index ea9aab8c75c2..d529f232d56f 100644 --- a/src/demo-app/live-announcer/live-announcer-demo.ts +++ b/src/demo-app/live-announcer/live-announcer-demo.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'toolbar-demo', templateUrl: 'live-announcer-demo.html', }) diff --git a/src/demo-app/main.ts b/src/demo-app/main.ts index 0401ab700872..34f0888c2e0f 100644 --- a/src/demo-app/main.ts +++ b/src/demo-app/main.ts @@ -4,7 +4,6 @@ import {NgModule, ApplicationRef} from '@angular/core'; import {HAMMER_GESTURE_CONFIG, BrowserModule} from '@angular/platform-browser'; import {HttpModule} from '@angular/http'; import {FormsModule} from '@angular/forms'; -import {CommonModule} from '@angular/common'; import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer'; import {MdGestureConfig} from '@angular2-material/core/gestures/MdGestureConfig'; import {MdIconRegistry} from '@angular2-material/icon/icon-registry'; diff --git a/src/demo-app/menu/menu-demo.ts b/src/demo-app/menu/menu-demo.ts index 6ea2956899d4..084200ad344c 100644 --- a/src/demo-app/menu/menu-demo.ts +++ b/src/demo-app/menu/menu-demo.ts @@ -5,7 +5,7 @@ import {MD_BUTTON_DIRECTIVES} from '@angular2-material/button/button'; import {MD_TOOLBAR_DIRECTIVES} from '@angular2-material/toolbar/toolbar'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'menu-demo', templateUrl: 'menu-demo.html', styleUrls: ['menu-demo.css'], diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts index a46d53160f89..ef2f36674407 100644 --- a/src/demo-app/overlay/overlay-demo.ts +++ b/src/demo-app/overlay/overlay-demo.ts @@ -21,7 +21,7 @@ import { @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'overlay-demo', templateUrl: 'overlay-demo.html', styleUrls: ['overlay-demo.css'], @@ -86,7 +86,7 @@ export class OverlayDemo { /** Simple component to load into an overlay */ @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'rotini-panel', template: '

Rotini {{value}}

' }) diff --git a/src/demo-app/portal/portal-demo.ts b/src/demo-app/portal/portal-demo.ts index 8c3e5f4e0eb3..2f555aa30037 100644 --- a/src/demo-app/portal/portal-demo.ts +++ b/src/demo-app/portal/portal-demo.ts @@ -9,7 +9,7 @@ import { @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'portal-demo', templateUrl: 'portal-demo.html', styleUrls: ['portal-demo.css'], @@ -34,7 +34,7 @@ export class PortalDemo { @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'science-joke', template: `

100 kilopascals go into a bar.

` }) diff --git a/src/demo-app/progress-bar/progress-bar-demo.ts b/src/demo-app/progress-bar/progress-bar-demo.ts index e9aec5717bf4..a2af3059e757 100644 --- a/src/demo-app/progress-bar/progress-bar-demo.ts +++ b/src/demo-app/progress-bar/progress-bar-demo.ts @@ -5,7 +5,7 @@ import {MdProgressBar} from '@angular2-material/progress-bar/progress-bar'; // TODO(josephperrott): Add an automatically filling example progress bar. @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'progress-bar-demo', templateUrl: 'progress-bar-demo.html', styleUrls: ['progress-bar-demo.css'], diff --git a/src/demo-app/progress-circle/progress-circle-demo.ts b/src/demo-app/progress-circle/progress-circle-demo.ts index c3edd1f73d9b..fae8f7a0c33c 100644 --- a/src/demo-app/progress-circle/progress-circle-demo.ts +++ b/src/demo-app/progress-circle/progress-circle-demo.ts @@ -3,7 +3,7 @@ import {MdButton} from '@angular2-material/button/button'; import {MdProgressCircle, MdSpinner} from '@angular2-material/progress-circle/progress-circle'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'progress-circle-demo', templateUrl: 'progress-circle-demo.html', styleUrls: ['progress-circle-demo.css'], diff --git a/src/demo-app/radio/radio-demo.ts b/src/demo-app/radio/radio-demo.ts index 22e9e546c611..ea119ff248c4 100644 --- a/src/demo-app/radio/radio-demo.ts +++ b/src/demo-app/radio/radio-demo.ts @@ -8,7 +8,7 @@ import { } from '@angular2-material/core/coordination/unique-selection-dispatcher'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'radio-demo', templateUrl: 'radio-demo.html', styleUrls: ['radio-demo.css'], diff --git a/src/demo-app/ripple/ripple-demo.ts b/src/demo-app/ripple/ripple-demo.ts index f9725266f38c..7f96f3cca39d 100644 --- a/src/demo-app/ripple/ripple-demo.ts +++ b/src/demo-app/ripple/ripple-demo.ts @@ -14,7 +14,7 @@ import { import {MD_RIPPLE_DIRECTIVES, MdRipple} from '@angular2-material/core/core'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'ripple-demo', templateUrl: 'ripple-demo.html', styleUrls: ['ripple-demo.css'], diff --git a/src/demo-app/sidenav/sidenav-demo.ts b/src/demo-app/sidenav/sidenav-demo.ts index 4070a7a53593..c894c6eb4a86 100644 --- a/src/demo-app/sidenav/sidenav-demo.ts +++ b/src/demo-app/sidenav/sidenav-demo.ts @@ -3,7 +3,7 @@ import {MdButton} from '@angular2-material/button/button'; import {MD_SIDENAV_DIRECTIVES} from '@angular2-material/sidenav/sidenav'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'sidenav-demo', templateUrl: 'sidenav-demo.html', styleUrls: ['sidenav-demo.css'], diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.ts b/src/demo-app/slide-toggle/slide-toggle-demo.ts index 39559f0948de..b71fc10b9262 100644 --- a/src/demo-app/slide-toggle/slide-toggle-demo.ts +++ b/src/demo-app/slide-toggle/slide-toggle-demo.ts @@ -3,7 +3,7 @@ import {FORM_DIRECTIVES} from '@angular/forms'; import {MdSlideToggle} from '@angular2-material/slide-toggle/slide-toggle'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'switch-demo', templateUrl: 'slide-toggle-demo.html', styleUrls: ['slide-toggle-demo.css'], diff --git a/src/demo-app/slider/slider-demo.ts b/src/demo-app/slider/slider-demo.ts index eb0e629a938b..45f2ee77a438 100644 --- a/src/demo-app/slider/slider-demo.ts +++ b/src/demo-app/slider/slider-demo.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {MD_SLIDER_DIRECTIVES} from '@angular2-material/slider/slider'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'slider-demo', templateUrl: 'slider-demo.html', }) diff --git a/src/demo-app/tabs/tab-group-demo.ts b/src/demo-app/tabs/tab-group-demo.ts index f62941a4c618..48ddd9ae1683 100644 --- a/src/demo-app/tabs/tab-group-demo.ts +++ b/src/demo-app/tabs/tab-group-demo.ts @@ -7,7 +7,7 @@ import {MdInput} from '@angular2-material/input/input'; import {Observable} from 'rxjs/Observable'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'tab-group-demo', templateUrl: 'tab-group-demo.html', styleUrls: ['tab-group-demo.css'], diff --git a/src/demo-app/toolbar/toolbar-demo.ts b/src/demo-app/toolbar/toolbar-demo.ts index b27acede0317..10270d9dbd00 100644 --- a/src/demo-app/toolbar/toolbar-demo.ts +++ b/src/demo-app/toolbar/toolbar-demo.ts @@ -3,7 +3,7 @@ import {MdIcon} from '@angular2-material/icon/icon'; import {MdToolbar} from '@angular2-material/toolbar/toolbar'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'toolbar-demo', templateUrl: 'toolbar-demo.html', styleUrls: ['toolbar-demo.css'], diff --git a/src/demo-app/tooltip/tooltip-demo.ts b/src/demo-app/tooltip/tooltip-demo.ts index d322a942f94c..393a5b4e6fa4 100644 --- a/src/demo-app/tooltip/tooltip-demo.ts +++ b/src/demo-app/tooltip/tooltip-demo.ts @@ -7,7 +7,7 @@ import {MdUniqueSelectionDispatcher} from import {MD_BUTTON_DIRECTIVES} from '@angular2-material/button/button'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'tooltip-demo', templateUrl: 'tooltip-demo.html', styleUrls: ['tooltip-demo.css'], diff --git a/src/e2e-app/button/button-e2e.ts b/src/e2e-app/button/button-e2e.ts index 4f9cf67d30cf..4dfb19deaa1c 100644 --- a/src/e2e-app/button/button-e2e.ts +++ b/src/e2e-app/button/button-e2e.ts @@ -3,7 +3,7 @@ import {MdButton, MdAnchor} from '@angular2-material/button/button'; import {MdIcon} from '@angular2-material/icon/icon'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'button-e2e', templateUrl: 'button-e2e.html', directives: [MdButton, MdAnchor, MdIcon] diff --git a/src/e2e-app/e2e-app/e2e-app.ts b/src/e2e-app/e2e-app/e2e-app.ts index 0a48fb7a85d5..865f3485a127 100644 --- a/src/e2e-app/e2e-app/e2e-app.ts +++ b/src/e2e-app/e2e-app/e2e-app.ts @@ -10,7 +10,7 @@ import {ROUTER_DIRECTIVES} from '@angular/router'; export class Home {} @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'e2e-app', providers: [], templateUrl: 'e2e-app.html', diff --git a/src/e2e-app/icon/icon-e2e.ts b/src/e2e-app/icon/icon-e2e.ts index 812937a1df65..ab9646794106 100644 --- a/src/e2e-app/icon/icon-e2e.ts +++ b/src/e2e-app/icon/icon-e2e.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {MD_ICON_DIRECTIVES} from '@angular2-material/icon/icon'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'icon-e2e', templateUrl: 'icon-e2e.html', directives: [MD_ICON_DIRECTIVES] diff --git a/src/e2e-app/menu/menu-e2e.ts b/src/e2e-app/menu/menu-e2e.ts index 2e552c0f5d2d..f397063f18ab 100644 --- a/src/e2e-app/menu/menu-e2e.ts +++ b/src/e2e-app/menu/menu-e2e.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {MD_MENU_DIRECTIVES} from '@angular2-material/menu/menu'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'menu-e2e', templateUrl: 'menu-e2e.html', directives: [MD_MENU_DIRECTIVES], diff --git a/src/e2e-app/tabs/tabs-e2e.ts b/src/e2e-app/tabs/tabs-e2e.ts index 3fa0188dedc7..d926ea609f7c 100644 --- a/src/e2e-app/tabs/tabs-e2e.ts +++ b/src/e2e-app/tabs/tabs-e2e.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {MD_TABS_DIRECTIVES} from '@angular2-material/tabs/tabs'; @Component({ - moduleId: module.id, + //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, selector: 'tabs-e2e', templateUrl: 'tabs-e2e.html', directives: [MD_TABS_DIRECTIVES] From 38638f072bf9c8a5a394c75ff2478d2c3f506054 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Fri, 29 Jul 2016 15:28:16 -0700 Subject: [PATCH 06/23] testing changes? --- scripts/release/stage-release.sh | 2 -- src/components/button-toggle/button-toggle.spec.ts | 11 ++++++----- src/components/button-toggle/button-toggle.ts | 2 +- src/components/button/button.spec.ts | 13 +++++++------ src/components/button/button.ts | 4 ++-- src/components/card/card.ts | 6 +++--- src/components/checkbox/checkbox.spec.ts | 10 +++++----- src/components/checkbox/checkbox.ts | 2 +- src/components/dialog/dialog-container.ts | 2 +- src/components/dialog/dialog.spec.ts | 10 +++++----- src/components/grid-list/grid-list.spec.ts | 10 +++++----- src/components/grid-list/grid-list.ts | 2 +- src/components/grid-list/grid-tile.ts | 4 ++-- src/components/icon/icon.spec.ts | 10 +++++----- src/components/icon/icon.ts | 2 +- src/components/input/input.spec.ts | 10 +++++----- src/components/input/input.ts | 2 +- src/components/list/list.spec.ts | 10 +++++----- src/components/list/list.ts | 4 ++-- src/components/menu/menu-directive.ts | 2 +- src/components/menu/menu.spec.ts | 10 +++++----- src/components/progress-bar/progress-bar.spec.ts | 10 +++++----- src/components/progress-bar/progress-bar.ts | 2 +- .../progress-circle/progress-circle.spec.ts | 10 +++++----- src/components/progress-circle/progress-circle.ts | 4 ++-- src/components/radio/radio.spec.ts | 10 +++++----- src/components/radio/radio.ts | 2 +- src/components/sidenav/sidenav.spec.ts | 10 +++++----- src/components/sidenav/sidenav.ts | 2 +- src/components/slide-toggle/slide-toggle.spec.ts | 10 +++++----- src/components/slide-toggle/slide-toggle.ts | 2 +- src/components/slider/slider.spec.ts | 10 +++++----- src/components/slider/slider.ts | 2 +- src/components/tabs/tab-group.spec.ts | 10 +++++----- src/components/tabs/tabs.ts | 2 +- src/components/toolbar/toolbar.spec.ts | 10 +++++----- src/components/toolbar/toolbar.ts | 2 +- src/components/tooltip/tooltip.spec.ts | 10 +++++----- src/components/tooltip/tooltip.ts | 2 +- src/core/a11y/live-announcer.spec.ts | 6 +++--- src/core/overlay/overlay-directives.spec.ts | 6 +++--- src/core/overlay/overlay.spec.ts | 6 +++--- src/core/portal/portal.spec.ts | 6 +++--- src/core/ripple/ripple.spec.ts | 6 +++--- src/demo-app/baseline/baseline-demo.ts | 2 +- src/demo-app/button-toggle/button-toggle-demo.ts | 2 +- src/demo-app/button/button-demo.ts | 2 +- src/demo-app/card/card-demo.ts | 2 +- src/demo-app/checkbox/checkbox-demo.ts | 4 ++-- src/demo-app/demo-app/demo-app.ts | 2 +- src/demo-app/demo-app/routes.ts | 4 ++-- src/demo-app/dialog/dialog-demo.ts | 2 +- src/demo-app/gestures/gestures-demo.ts | 2 +- src/demo-app/grid-list/grid-list-demo.ts | 2 +- src/demo-app/icon/icon-demo.ts | 2 +- src/demo-app/input/input-demo.ts | 2 +- src/demo-app/list/list-demo.ts | 2 +- src/demo-app/live-announcer/live-announcer-demo.ts | 2 +- src/demo-app/menu/menu-demo.ts | 2 +- src/demo-app/overlay/overlay-demo.ts | 4 ++-- src/demo-app/portal/portal-demo.ts | 4 ++-- src/demo-app/progress-bar/progress-bar-demo.ts | 2 +- .../progress-circle/progress-circle-demo.ts | 2 +- src/demo-app/radio/radio-demo.ts | 2 +- src/demo-app/ripple/ripple-demo.ts | 2 +- src/demo-app/sidenav/sidenav-demo.ts | 2 +- src/demo-app/slide-toggle/slide-toggle-demo.ts | 2 +- src/demo-app/slider/slider-demo.ts | 2 +- src/demo-app/tabs/tab-group-demo.ts | 2 +- src/demo-app/toolbar/toolbar-demo.ts | 2 +- src/demo-app/tooltip/tooltip-demo.ts | 2 +- src/e2e-app/button/button-e2e.ts | 2 +- src/e2e-app/e2e-app/e2e-app.ts | 2 +- src/e2e-app/icon/icon-e2e.ts | 2 +- src/e2e-app/menu/menu-e2e.ts | 2 +- src/e2e-app/tabs/tabs-e2e.ts | 2 +- test/karma-test-shim.js | 2 +- 77 files changed, 171 insertions(+), 171 deletions(-) diff --git a/scripts/release/stage-release.sh b/scripts/release/stage-release.sh index c5c412197d2e..bdd1a2c465bc 100755 --- a/scripts/release/stage-release.sh +++ b/scripts/release/stage-release.sh @@ -30,8 +30,6 @@ sleep 1 # demo-app when we're staging a release (only components/ and core/). tsc -p ./src/demo-app -exit 0 - # Now run ngc to generate the .metadata.json files. Our tsconfig is configred with # skipTemplateCodegen, so only the metadata files are actually generated. ./node_modules/.bin/ngc -p ./src/demo-app diff --git a/src/components/button-toggle/button-toggle.spec.ts b/src/components/button-toggle/button-toggle.spec.ts index 2f43da2621ce..d5bd5e9c6cef 100644 --- a/src/components/button-toggle/button-toggle.spec.ts +++ b/src/components/button-toggle/button-toggle.spec.ts @@ -5,8 +5,8 @@ import { tick, TestComponentBuilder, ComponentFixture, - doAsyncEntryPointCompilation, - configureModule, + //doAsyncEntryPointCompilation, + TestBed, } from '@angular/core/testing'; import {NgControl, FormsModule} from '@angular/forms'; import {Component, DebugElement} from '@angular/core'; @@ -28,13 +28,14 @@ describe('MdButtonToggle', () => { let dispatcher: MdUniqueSelectionDispatcher; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdButtonToggleModule, FormsModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); - doAsyncEntryPointCompilation(); + + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/button-toggle/button-toggle.ts b/src/components/button-toggle/button-toggle.ts index d72153cb19a2..ffe9da869d94 100644 --- a/src/components/button-toggle/button-toggle.ts +++ b/src/components/button-toggle/button-toggle.ts @@ -209,7 +209,7 @@ export class MdButtonToggleGroupMultiple { } @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-button-toggle', templateUrl: 'button-toggle.html', styleUrls: ['button-toggle.css'], diff --git a/src/components/button/button.spec.ts b/src/components/button/button.spec.ts index 80a47c4e0795..c0d64dc42e33 100644 --- a/src/components/button/button.spec.ts +++ b/src/components/button/button.spec.ts @@ -1,26 +1,27 @@ import { inject, TestComponentBuilder, - configureModule, - doAsyncEntryPointCompilation, + //doAsyncEntryPointCompilation, async, + TestBed, } from '@angular/core/testing'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; import {MdButtonModule} from './button'; -describe('MdButton', () => { +fdescribe('MdButton', () => { let builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdButtonModule], declarations: [TestApp], - entryComponents: [TestApp], + //entryComponents: [TestApp], }); - doAsyncEntryPointCompilation(); + TestBed.compileComponents(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/button/button.ts b/src/components/button/button.ts index 874aead622ba..5c519e047c63 100644 --- a/src/components/button/button.ts +++ b/src/components/button/button.ts @@ -16,7 +16,7 @@ import { @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'button[md-button], button[md-raised-button], button[md-icon-button], ' + 'button[md-fab], button[md-mini-fab]', inputs: ['color'], @@ -86,7 +86,7 @@ export class MdButton { } @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'a[md-button], a[md-raised-button], a[md-icon-button], a[md-fab], a[md-mini-fab]', inputs: ['color'], host: { diff --git a/src/components/card/card.ts b/src/components/card/card.ts index ea54f716994f..a3dc9e0c54b7 100644 --- a/src/components/card/card.ts +++ b/src/components/card/card.ts @@ -21,7 +21,7 @@ it also provides a number of preset styles for common card sections, including: */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-card', templateUrl: 'card.html', styleUrls: ['card.css'], @@ -46,7 +46,7 @@ TODO(kara): update link to demo site when it exists */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-card-header', templateUrl: 'card-header.html', encapsulation: ViewEncapsulation.None, @@ -66,7 +66,7 @@ TODO(kara): update link to demo site when it exists */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-card-title-group', templateUrl: 'card-title-group.html', encapsulation: ViewEncapsulation.None, diff --git a/src/components/checkbox/checkbox.spec.ts b/src/components/checkbox/checkbox.spec.ts index dfefc3ab2c32..3e3b937b4e8c 100644 --- a/src/components/checkbox/checkbox.spec.ts +++ b/src/components/checkbox/checkbox.spec.ts @@ -5,8 +5,8 @@ import { flushMicrotasks, TestComponentBuilder, ComponentFixture, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import { FORM_DIRECTIVES, @@ -26,13 +26,13 @@ describe('MdCheckbox', () => { let fixture: ComponentFixture; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdCheckboxModule, FormsModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/checkbox/checkbox.ts b/src/components/checkbox/checkbox.ts index 3939c927e180..9a14b7c1cb80 100644 --- a/src/components/checkbox/checkbox.ts +++ b/src/components/checkbox/checkbox.ts @@ -56,7 +56,7 @@ export class MdCheckboxChange { * See: https://www.google.com/design/spec/components/selection-controls.html */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-checkbox', templateUrl: 'checkbox.html', styleUrls: ['checkbox.css'], diff --git a/src/components/dialog/dialog-container.ts b/src/components/dialog/dialog-container.ts index 9a099771f95f..9c52e7ddf936 100644 --- a/src/components/dialog/dialog-container.ts +++ b/src/components/dialog/dialog-container.ts @@ -14,7 +14,7 @@ import {MdDialogContentAlreadyAttachedError} from './dialog-errors'; * Internal component that wraps user-provided dialog content. */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-dialog-container', templateUrl: 'dialog-container.html', styleUrls: ['dialog-container.css'], diff --git a/src/components/dialog/dialog.spec.ts b/src/components/dialog/dialog.spec.ts index fc5254ca61b6..f776d0028aac 100644 --- a/src/components/dialog/dialog.spec.ts +++ b/src/components/dialog/dialog.spec.ts @@ -5,8 +5,8 @@ import { addProviders, TestComponentBuilder, ComponentFixture, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import { Component, @@ -32,10 +32,10 @@ describe('MdDialog', () => { let viewContainerFixture: ComponentFixture; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdDialogModule], declarations: [TEST_COMPONENTS, DirectiveWithViewContainer], - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); addProviders([ @@ -45,7 +45,7 @@ describe('MdDialog', () => { }} ]); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); let deps = [TestComponentBuilder, MdDialog]; diff --git a/src/components/grid-list/grid-list.spec.ts b/src/components/grid-list/grid-list.spec.ts index d8e87ac2b239..04c0a3a28661 100644 --- a/src/components/grid-list/grid-list.spec.ts +++ b/src/components/grid-list/grid-list.spec.ts @@ -2,8 +2,8 @@ import { inject, async, TestComponentBuilder, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -14,13 +14,13 @@ describe('MdGridList', () => { let builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdGridListModule], declarations: [TestGridList], - entryComponents: [TestGridList], + //entryComponents: [TestGridList], }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/grid-list/grid-list.ts b/src/components/grid-list/grid-list.ts index eefa969ac322..b7ffd0675591 100644 --- a/src/components/grid-list/grid-list.ts +++ b/src/components/grid-list/grid-list.ts @@ -31,7 +31,7 @@ import {coerceToString, coerceToNumber} from './grid-list-measure'; const MD_FIT_MODE = 'fit'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-grid-list', templateUrl: 'grid-list.html', styleUrls: ['grid-list.css'], diff --git a/src/components/grid-list/grid-tile.ts b/src/components/grid-list/grid-tile.ts index 43bd6b6e8129..f6e5aa00577d 100644 --- a/src/components/grid-list/grid-tile.ts +++ b/src/components/grid-list/grid-tile.ts @@ -12,7 +12,7 @@ import { MdLine, MdLineSetter } from '@angular2-material/core/line/line'; import {coerceToNumber} from './grid-list-measure'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-grid-tile', host: { 'role': 'listitem' }, templateUrl: 'grid-tile.html', @@ -54,7 +54,7 @@ export class MdGridTile { } @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-grid-tile-header, md-grid-tile-footer', templateUrl: 'grid-tile-text.html' }) diff --git a/src/components/icon/icon.spec.ts b/src/components/icon/icon.spec.ts index a0c724e95aaf..127fd8a485dc 100644 --- a/src/components/icon/icon.spec.ts +++ b/src/components/icon/icon.spec.ts @@ -3,8 +3,8 @@ import { inject, async, TestComponentBuilder, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {XHRBackend} from '@angular/http'; import {MockBackend} from '@angular/http/testing'; @@ -41,10 +41,10 @@ const verifyPathChildElement = (element: Element, attributeValue: string) => { describe('MdIcon', () => { beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdIconModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); addProviders([ @@ -52,7 +52,7 @@ describe('MdIcon', () => { {provide: XHRBackend, useExisting: MockBackend}, ]); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); let builder: TestComponentBuilder; diff --git a/src/components/icon/icon.ts b/src/components/icon/icon.ts index 086b10bbc0f3..ca35da9817df 100644 --- a/src/components/icon/icon.ts +++ b/src/components/icon/icon.ts @@ -58,7 +58,7 @@ export class MdIconInvalidNameError extends MdError { * */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, template: '', selector: 'md-icon', styleUrls: ['icon.css'], diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts index e6987404fef3..05638e11cd20 100644 --- a/src/components/input/input.spec.ts +++ b/src/components/input/input.spec.ts @@ -2,8 +2,8 @@ import { async, inject, TestComponentBuilder, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component} from '@angular/core'; import {FormsModule} from '@angular/forms'; @@ -15,13 +15,13 @@ describe('MdInput', function () { var builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdInputModule, FormsModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], function (tcb: TestComponentBuilder) { diff --git a/src/components/input/input.ts b/src/components/input/input.ts index a481010fa90d..3e505dc811b4 100644 --- a/src/components/input/input.ts +++ b/src/components/input/input.ts @@ -95,7 +95,7 @@ export class MdHint { * improve on its behaviour, along with styling it according to the Material Design. */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-input', templateUrl: 'input.html', styleUrls: ['input.css'], diff --git a/src/components/list/list.spec.ts b/src/components/list/list.spec.ts index d13b943be011..6c8072fafe50 100644 --- a/src/components/list/list.spec.ts +++ b/src/components/list/list.spec.ts @@ -2,8 +2,8 @@ import { inject, async, TestComponentBuilder, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -13,13 +13,13 @@ describe('MdList', () => { let builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdListModule], declarations: [TestList], - entryComponents: [TestList], + //entryComponents: [TestList], }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/list/list.ts b/src/components/list/list.ts index dfdb01129a13..2768e7a95bbf 100644 --- a/src/components/list/list.ts +++ b/src/components/list/list.ts @@ -13,7 +13,7 @@ import { import {MdLine, MdLineSetter, MdLineModule} from '@angular2-material/core/line/line'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-list, md-nav-list', host: {'role': 'list'}, template: '', @@ -27,7 +27,7 @@ export class MdList {} export class MdListAvatar {} @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-list-item, a[md-list-item]', host: { 'role': 'listitem', diff --git a/src/components/menu/menu-directive.ts b/src/components/menu/menu-directive.ts index 1a7191278745..bac6f9181a1c 100644 --- a/src/components/menu/menu-directive.ts +++ b/src/components/menu/menu-directive.ts @@ -15,7 +15,7 @@ import {MenuPositionX, MenuPositionY} from './menu-positions'; import {MdMenuInvalidPositionX, MdMenuInvalidPositionY} from './menu-errors'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-menu', host: {'role': 'menu'}, templateUrl: 'menu.html', diff --git a/src/components/menu/menu.spec.ts b/src/components/menu/menu.spec.ts index c3b8bb8b4720..7c08953bb562 100644 --- a/src/components/menu/menu.spec.ts +++ b/src/components/menu/menu.spec.ts @@ -1,8 +1,8 @@ import { inject, TestComponentBuilder, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, async, } from '@angular/core/testing'; import {Component} from '@angular/core'; @@ -12,13 +12,13 @@ describe('MdMenu', () => { let builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdMenuModule], declarations: [TestList], - entryComponents: [TestList], + //entryComponents: [TestList], }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/progress-bar/progress-bar.spec.ts b/src/components/progress-bar/progress-bar.spec.ts index f7ef1483d7ef..c542d285e1b5 100644 --- a/src/components/progress-bar/progress-bar.spec.ts +++ b/src/components/progress-bar/progress-bar.spec.ts @@ -1,8 +1,8 @@ import { inject, TestComponentBuilder, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, async, } from '@angular/core/testing'; import {Component} from '@angular/core'; @@ -14,13 +14,13 @@ describe('MdProgressBar', () => { let builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdProgressBarModule], declarations: [TestApp], - entryComponents: [TestApp], + //entryComponents: [TestApp], }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/progress-bar/progress-bar.ts b/src/components/progress-bar/progress-bar.ts index cc7dba748729..e405d9e7c7b1 100644 --- a/src/components/progress-bar/progress-bar.ts +++ b/src/components/progress-bar/progress-bar.ts @@ -15,7 +15,7 @@ import {CommonModule} from '@angular/common'; * component. */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-progress-bar', host: { 'role': 'progressbar', diff --git a/src/components/progress-circle/progress-circle.spec.ts b/src/components/progress-circle/progress-circle.spec.ts index abfb70c2a770..f1956a171de7 100644 --- a/src/components/progress-circle/progress-circle.spec.ts +++ b/src/components/progress-circle/progress-circle.spec.ts @@ -1,8 +1,8 @@ import { inject, TestComponentBuilder, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, async, } from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; @@ -14,13 +14,13 @@ describe('MdProgressCircular', () => { let builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdProgressCircleModule], declarations: [TestApp], - entryComponents: [TestApp], + //entryComponents: [TestApp], }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/progress-circle/progress-circle.ts b/src/components/progress-circle/progress-circle.ts index ba2d2b153fcf..859dd6d9d489 100644 --- a/src/components/progress-circle/progress-circle.ts +++ b/src/components/progress-circle/progress-circle.ts @@ -32,7 +32,7 @@ type EasingFn = (currentTime: number, startValue: number, * component. */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-progress-circle', host: { 'role': 'progressbar', @@ -219,7 +219,7 @@ export class MdProgressCircle implements OnDestroy { * indeterminate instance. */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-spinner', host: { 'role': 'progressbar', diff --git a/src/components/radio/radio.spec.ts b/src/components/radio/radio.spec.ts index 9ad96352093e..8ad71beb99e3 100644 --- a/src/components/radio/radio.spec.ts +++ b/src/components/radio/radio.spec.ts @@ -5,8 +5,8 @@ import { tick, TestComponentBuilder, ComponentFixture, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {FORM_DIRECTIVES, NgControl, FormsModule} from '@angular/forms'; import {Component, DebugElement} from '@angular/core'; @@ -25,13 +25,13 @@ describe('MdRadio', () => { let dispatcher: MdUniqueSelectionDispatcher; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdRadioModule, FormsModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); let injectDeps = [TestComponentBuilder, MdUniqueSelectionDispatcher]; diff --git a/src/components/radio/radio.ts b/src/components/radio/radio.ts index e8d4e42ff0e6..eee7e82fc11f 100644 --- a/src/components/radio/radio.ts +++ b/src/components/radio/radio.ts @@ -234,7 +234,7 @@ export class MdRadioGroup implements AfterContentInit, ControlValueAccessor { @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-radio-button', templateUrl: 'radio.html', styleUrls: ['radio.css'], diff --git a/src/components/sidenav/sidenav.spec.ts b/src/components/sidenav/sidenav.spec.ts index 5698b6172156..27f78eb3dbd2 100644 --- a/src/components/sidenav/sidenav.spec.ts +++ b/src/components/sidenav/sidenav.spec.ts @@ -5,8 +5,8 @@ import { tick, TestComponentBuilder, ComponentFixture, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {XHR} from '@angular/compiler'; import { @@ -56,13 +56,13 @@ describe('MdSidenav', () => { let xhr: XHR; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdSidenavModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder, XHR], (tcb: TestComponentBuilder, x: XHR) => { diff --git a/src/components/sidenav/sidenav.ts b/src/components/sidenav/sidenav.ts index 8f71650f1b6c..7cfbbaf2105d 100644 --- a/src/components/sidenav/sidenav.ts +++ b/src/components/sidenav/sidenav.ts @@ -222,7 +222,7 @@ export class MdSidenav { * and coordinate the backdrop and content styling. */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-sidenav-layout', // Do not use ChangeDetectionStrategy.OnPush. It does not work for this component because // technically it is a sibling of MdSidenav (on the content tree) and isn't updated when MdSidenav diff --git a/src/components/slide-toggle/slide-toggle.spec.ts b/src/components/slide-toggle/slide-toggle.spec.ts index c0b6c4ab428a..d1c16d849bb1 100644 --- a/src/components/slide-toggle/slide-toggle.spec.ts +++ b/src/components/slide-toggle/slide-toggle.spec.ts @@ -3,8 +3,8 @@ import { async, TestComponentBuilder, ComponentFixture, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {By} from '@angular/platform-browser'; import {Component} from '@angular/core'; @@ -15,13 +15,13 @@ describe('MdSlideToggle', () => { let builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdSlideToggleModule, FormsModule], declarations: [SlideToggleTestApp], - entryComponents: [SlideToggleTestApp], + //entryComponents: [SlideToggleTestApp], }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/slide-toggle/slide-toggle.ts b/src/components/slide-toggle/slide-toggle.ts index 8116866c8049..1cc5c744c9c6 100644 --- a/src/components/slide-toggle/slide-toggle.ts +++ b/src/components/slide-toggle/slide-toggle.ts @@ -35,7 +35,7 @@ export class MdSlideToggleChange { let nextId = 0; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-slide-toggle', host: { '[class.md-checked]': 'checked', diff --git a/src/components/slider/slider.spec.ts b/src/components/slider/slider.spec.ts index 2267aa85907b..dfa865e34a67 100644 --- a/src/components/slider/slider.spec.ts +++ b/src/components/slider/slider.spec.ts @@ -4,8 +4,8 @@ import { async, TestComponentBuilder, ComponentFixture, - configureModule, - doAsyncEntryPointCompilation + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component, DebugElement, ViewEncapsulation} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -18,10 +18,10 @@ describe('MdSlider', () => { let gestureConfig: TestGestureConfig; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdSliderModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); addProviders([ @@ -31,7 +31,7 @@ describe('MdSlider', () => { }} ]); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/slider/slider.ts b/src/components/slider/slider.ts index e93686404d58..3bc3e87deb9e 100644 --- a/src/components/slider/slider.ts +++ b/src/components/slider/slider.ts @@ -11,7 +11,7 @@ import {BooleanFieldValue} from '@angular2-material/core/annotations/field-value import {applyCssTransform} from '@angular2-material/core/style/apply-transform'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-slider', host: { 'tabindex': '0', diff --git a/src/components/tabs/tab-group.spec.ts b/src/components/tabs/tab-group.spec.ts index 79e3d730c015..8508c58b5451 100644 --- a/src/components/tabs/tab-group.spec.ts +++ b/src/components/tabs/tab-group.spec.ts @@ -5,8 +5,8 @@ import { tick, TestComponentBuilder, ComponentFixture, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {MdTabGroup, MdTabsModule} from './tabs'; import {Component} from '@angular/core'; @@ -18,13 +18,13 @@ describe('MdTabGroup', () => { let builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdTabsModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts index b975d7c3636c..42e039faf45b 100644 --- a/src/components/tabs/tabs.ts +++ b/src/components/tabs/tabs.ts @@ -51,7 +51,7 @@ export class MdTab { * See: https://www.google.com/design/spec/components/tabs.html */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-tab-group', templateUrl: 'tab-group.html', styleUrls: ['tab-group.css'], diff --git a/src/components/toolbar/toolbar.spec.ts b/src/components/toolbar/toolbar.spec.ts index 4d2d3c6dba3a..354d438a7a06 100644 --- a/src/components/toolbar/toolbar.spec.ts +++ b/src/components/toolbar/toolbar.spec.ts @@ -2,8 +2,8 @@ import {Component} from '@angular/core'; import { inject, TestComponentBuilder, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, async, } from '@angular/core/testing'; import {By} from '@angular/platform-browser'; @@ -13,13 +13,13 @@ describe('MdToolbar', () => { let builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdToolbarModule], declarations: [TestApp], - entryComponents: [TestApp], + //entryComponents: [TestApp], }); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/toolbar/toolbar.ts b/src/components/toolbar/toolbar.ts index 1d04b2548722..52d0c605da08 100644 --- a/src/components/toolbar/toolbar.ts +++ b/src/components/toolbar/toolbar.ts @@ -9,7 +9,7 @@ import {Renderer} from '@angular/core'; import {ElementRef} from '@angular/core'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-toolbar', templateUrl: 'toolbar.html', styleUrls: ['toolbar.css'], diff --git a/src/components/tooltip/tooltip.spec.ts b/src/components/tooltip/tooltip.spec.ts index fbe7cf48fba7..4b182b735896 100644 --- a/src/components/tooltip/tooltip.spec.ts +++ b/src/components/tooltip/tooltip.spec.ts @@ -4,8 +4,8 @@ import { addProviders, TestComponentBuilder, ComponentFixture, - configureModule, - doAsyncEntryPointCompilation, + TestBed, + //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -20,10 +20,10 @@ describe('MdTooltip', () => { let overlayContainerElement: HTMLElement; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdTooltipModule], declarations: [BasicTooltipDemo], - entryComponents: [BasicTooltipDemo], + //entryComponents: [BasicTooltipDemo], }); addProviders([ @@ -33,7 +33,7 @@ describe('MdTooltip', () => { }} ]); - doAsyncEntryPointCompilation(); + //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/tooltip/tooltip.ts b/src/components/tooltip/tooltip.ts index 0d0707207d7b..34616c62471f 100644 --- a/src/components/tooltip/tooltip.ts +++ b/src/components/tooltip/tooltip.ts @@ -182,7 +182,7 @@ export class MdTooltip { } @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-tooltip-component', template: `
{{message}}
`, styleUrls: ['tooltip.css'], diff --git a/src/core/a11y/live-announcer.spec.ts b/src/core/a11y/live-announcer.spec.ts index f9de2b55957c..9689799999ed 100644 --- a/src/core/a11y/live-announcer.spec.ts +++ b/src/core/a11y/live-announcer.spec.ts @@ -6,7 +6,7 @@ import { addProviders, TestComponentBuilder, ComponentFixture, - configureModule, + TestBed, } from '@angular/core/testing'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -18,9 +18,9 @@ describe('MdLiveAnnouncer', () => { let liveEl: Element; describe('with default element', () => { - beforeEach(() => configureModule({ + beforeEach(() => TestBed.configureTestingModule({ declarations: [TestApp], - entryComponents: [TestApp], + //entryComponents: [TestApp], providers: [MdLiveAnnouncer] })); diff --git a/src/core/overlay/overlay-directives.spec.ts b/src/core/overlay/overlay-directives.spec.ts index e911c6c6979f..2f4ccbff4739 100644 --- a/src/core/overlay/overlay-directives.spec.ts +++ b/src/core/overlay/overlay-directives.spec.ts @@ -6,7 +6,7 @@ import { addProviders, TestComponentBuilder, ComponentFixture, - configureModule, + TestBed, } from '@angular/core/testing'; import {Component, ViewChild} from '@angular/core'; import {ConnectedOverlayDirective, OverlayModule} from './overlay-directives'; @@ -20,10 +20,10 @@ describe('Overlay directives', () => { let fixture: ComponentFixture; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [OverlayModule], declarations: [ConnectedOverlayDirectiveTest], - entryComponents: [ConnectedOverlayDirectiveTest], + //entryComponents: [ConnectedOverlayDirectiveTest], }); addProviders([ diff --git a/src/core/overlay/overlay.spec.ts b/src/core/overlay/overlay.spec.ts index 23717d131a58..85ba90fb465f 100644 --- a/src/core/overlay/overlay.spec.ts +++ b/src/core/overlay/overlay.spec.ts @@ -4,7 +4,7 @@ import { flushMicrotasks, addProviders, TestComponentBuilder, - configureModule, + TestBed, async, } from '@angular/core/testing'; import {Component, ViewChild, ViewContainerRef} from '@angular/core'; @@ -26,10 +26,10 @@ describe('Overlay', () => { let overlayContainerElement: HTMLElement; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [OverlayModule, PortalModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, providers: [ {provide: OverlayContainer, useFactory: () => { overlayContainerElement = document.createElement('div'); diff --git a/src/core/portal/portal.spec.ts b/src/core/portal/portal.spec.ts index f9104cfc5030..79ca75704870 100644 --- a/src/core/portal/portal.spec.ts +++ b/src/core/portal/portal.spec.ts @@ -4,7 +4,7 @@ import { flushMicrotasks, TestComponentBuilder, ComponentFixture, - configureModule, + TestBed, async, } from '@angular/core/testing'; import { @@ -25,10 +25,10 @@ describe('Portals', () => { let builder: TestComponentBuilder; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [PortalModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); })); diff --git a/src/core/ripple/ripple.spec.ts b/src/core/ripple/ripple.spec.ts index e01251a8e4fa..ba20f77469c2 100644 --- a/src/core/ripple/ripple.spec.ts +++ b/src/core/ripple/ripple.spec.ts @@ -1,5 +1,5 @@ import { - configureModule, + TestBed, inject, async, TestComponentBuilder, @@ -68,10 +68,10 @@ describe('MdRipple', () => { let originalBodyMargin: string; beforeEach(async(() => { - configureModule({ + TestBed.configureTestingModule({ imports: [MdRippleModule], declarations: TEST_COMPONENTS, - entryComponents: TEST_COMPONENTS, + //entryComponents: TEST_COMPONENTS, }); })); diff --git a/src/demo-app/baseline/baseline-demo.ts b/src/demo-app/baseline/baseline-demo.ts index e99a680ebaad..7f571c6dd9e9 100644 --- a/src/demo-app/baseline/baseline-demo.ts +++ b/src/demo-app/baseline/baseline-demo.ts @@ -13,7 +13,7 @@ import { @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'baseline-demo', templateUrl: 'baseline-demo.html', styleUrls: ['baseline-demo.css'], diff --git a/src/demo-app/button-toggle/button-toggle-demo.ts b/src/demo-app/button-toggle/button-toggle-demo.ts index 82589615310c..c246b8731a9f 100644 --- a/src/demo-app/button-toggle/button-toggle-demo.ts +++ b/src/demo-app/button-toggle/button-toggle-demo.ts @@ -4,7 +4,7 @@ import { } from '@angular2-material/core/coordination/unique-selection-dispatcher'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'button-toggle-demo', templateUrl: 'button-toggle-demo.html', providers: [MdUniqueSelectionDispatcher], diff --git a/src/demo-app/button/button-demo.ts b/src/demo-app/button/button-demo.ts index 7767010d9781..47e77f4f3d9e 100644 --- a/src/demo-app/button/button-demo.ts +++ b/src/demo-app/button/button-demo.ts @@ -3,7 +3,7 @@ import {MdButton, MdAnchor} from '@angular2-material/button/button'; import {MdIcon} from '@angular2-material/icon/icon'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'button-demo', templateUrl: 'button-demo.html', styleUrls: ['button-demo.css'], diff --git a/src/demo-app/card/card-demo.ts b/src/demo-app/card/card-demo.ts index 03ae76d44c59..47ee16f0b645 100644 --- a/src/demo-app/card/card-demo.ts +++ b/src/demo-app/card/card-demo.ts @@ -3,7 +3,7 @@ import {MdButton} from '@angular2-material/button/button'; import {MD_CARD_DIRECTIVES} from '@angular2-material/card/card'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'card-demo', templateUrl: 'card-demo.html', styleUrls: ['card-demo.css'], diff --git a/src/demo-app/checkbox/checkbox-demo.ts b/src/demo-app/checkbox/checkbox-demo.ts index d1b9bb5a8845..cb7b9605ba4e 100644 --- a/src/demo-app/checkbox/checkbox-demo.ts +++ b/src/demo-app/checkbox/checkbox-demo.ts @@ -10,7 +10,7 @@ export interface Task { } @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-checkbox-demo-nested-checklist', styles: [` li { @@ -59,7 +59,7 @@ export class MdCheckboxDemoNestedChecklist { } @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-checkbox-demo', templateUrl: 'checkbox-demo.html', styleUrls: ['checkbox-demo.css'], diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts index 562f83ad32c8..86442e6e90e4 100644 --- a/src/demo-app/demo-app/demo-app.ts +++ b/src/demo-app/demo-app/demo-app.ts @@ -11,7 +11,7 @@ import {Component, ViewEncapsulation} from '@angular/core'; export class Home {} @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'demo-app', providers: [], templateUrl: 'demo-app.html', diff --git a/src/demo-app/demo-app/routes.ts b/src/demo-app/demo-app/routes.ts index 7215eeafe702..6a5ed2b1d9e8 100644 --- a/src/demo-app/demo-app/routes.ts +++ b/src/demo-app/demo-app/routes.ts @@ -1,4 +1,4 @@ -import {provideRouter, RouterConfig} from '@angular/router'; +import {provideRouter, Routes} from '@angular/router'; import {Home} from './demo-app'; import {ButtonDemo} from '../button/button-demo'; import {BaselineDemo} from '../baseline/baseline-demo'; @@ -27,7 +27,7 @@ import {DialogDemo} from '../dialog/dialog-demo'; import {TooltipDemo} from '../tooltip/tooltip-demo'; -export const routes: RouterConfig = [ +export const routes: Routes = [ {path: '', component: Home}, {path: 'button', component: ButtonDemo}, {path: 'card', component: CardDemo}, diff --git a/src/demo-app/dialog/dialog-demo.ts b/src/demo-app/dialog/dialog-demo.ts index 3d20aebca901..a52b699cfde4 100644 --- a/src/demo-app/dialog/dialog-demo.ts +++ b/src/demo-app/dialog/dialog-demo.ts @@ -3,7 +3,7 @@ import {MdDialog, MdDialogConfig, MdDialogRef} from '@angular2-material/dialog/d import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'dialog-demo', templateUrl: 'dialog-demo.html', styleUrls: ['dialog-demo.css'], diff --git a/src/demo-app/gestures/gestures-demo.ts b/src/demo-app/gestures/gestures-demo.ts index c32e50e791c7..13df7c29a2aa 100644 --- a/src/demo-app/gestures/gestures-demo.ts +++ b/src/demo-app/gestures/gestures-demo.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'gestures-demo', templateUrl: 'gestures-demo.html', styleUrls: ['gestures-demo.css'], diff --git a/src/demo-app/grid-list/grid-list-demo.ts b/src/demo-app/grid-list/grid-list-demo.ts index 1f352ded3421..e5dcae48b0eb 100644 --- a/src/demo-app/grid-list/grid-list-demo.ts +++ b/src/demo-app/grid-list/grid-list-demo.ts @@ -7,7 +7,7 @@ import {MD_CARD_DIRECTIVES} from '@angular2-material/card/card'; import {MdIcon, MdIconRegistry} from '@angular2-material/icon/icon'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'grid-list-demo', templateUrl: 'grid-list-demo.html', styleUrls: ['grid-list-demo.css'], diff --git a/src/demo-app/icon/icon-demo.ts b/src/demo-app/icon/icon-demo.ts index e36306cacc74..23546d8d2af5 100644 --- a/src/demo-app/icon/icon-demo.ts +++ b/src/demo-app/icon/icon-demo.ts @@ -2,7 +2,7 @@ import {Component, ViewEncapsulation} from '@angular/core'; import {MdIcon, MdIconRegistry} from '@angular2-material/icon/icon'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'md-icon-demo', templateUrl: 'icon-demo.html', styleUrls: ['icon-demo.css'], diff --git a/src/demo-app/input/input-demo.ts b/src/demo-app/input/input-demo.ts index a43b552d6caa..0b15cdba8bff 100644 --- a/src/demo-app/input/input-demo.ts +++ b/src/demo-app/input/input-demo.ts @@ -12,7 +12,7 @@ import {MdToolbar} from '@angular2-material/toolbar/toolbar'; let max = 5; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'input-demo', templateUrl: 'input-demo.html', styleUrls: ['input-demo.css'], diff --git a/src/demo-app/list/list-demo.ts b/src/demo-app/list/list-demo.ts index 7887b14dfa68..50026b5d5146 100644 --- a/src/demo-app/list/list-demo.ts +++ b/src/demo-app/list/list-demo.ts @@ -5,7 +5,7 @@ import {MD_LIST_DIRECTIVES} from '@angular2-material/list/list'; import {MdIcon} from '@angular2-material/icon/icon'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'list-demo', templateUrl: 'list-demo.html', styleUrls: ['list-demo.css'], diff --git a/src/demo-app/live-announcer/live-announcer-demo.ts b/src/demo-app/live-announcer/live-announcer-demo.ts index d529f232d56f..ea9aab8c75c2 100644 --- a/src/demo-app/live-announcer/live-announcer-demo.ts +++ b/src/demo-app/live-announcer/live-announcer-demo.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'toolbar-demo', templateUrl: 'live-announcer-demo.html', }) diff --git a/src/demo-app/menu/menu-demo.ts b/src/demo-app/menu/menu-demo.ts index 084200ad344c..6ea2956899d4 100644 --- a/src/demo-app/menu/menu-demo.ts +++ b/src/demo-app/menu/menu-demo.ts @@ -5,7 +5,7 @@ import {MD_BUTTON_DIRECTIVES} from '@angular2-material/button/button'; import {MD_TOOLBAR_DIRECTIVES} from '@angular2-material/toolbar/toolbar'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'menu-demo', templateUrl: 'menu-demo.html', styleUrls: ['menu-demo.css'], diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts index ef2f36674407..a46d53160f89 100644 --- a/src/demo-app/overlay/overlay-demo.ts +++ b/src/demo-app/overlay/overlay-demo.ts @@ -21,7 +21,7 @@ import { @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'overlay-demo', templateUrl: 'overlay-demo.html', styleUrls: ['overlay-demo.css'], @@ -86,7 +86,7 @@ export class OverlayDemo { /** Simple component to load into an overlay */ @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'rotini-panel', template: '

Rotini {{value}}

' }) diff --git a/src/demo-app/portal/portal-demo.ts b/src/demo-app/portal/portal-demo.ts index 2f555aa30037..8c3e5f4e0eb3 100644 --- a/src/demo-app/portal/portal-demo.ts +++ b/src/demo-app/portal/portal-demo.ts @@ -9,7 +9,7 @@ import { @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'portal-demo', templateUrl: 'portal-demo.html', styleUrls: ['portal-demo.css'], @@ -34,7 +34,7 @@ export class PortalDemo { @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'science-joke', template: `

100 kilopascals go into a bar.

` }) diff --git a/src/demo-app/progress-bar/progress-bar-demo.ts b/src/demo-app/progress-bar/progress-bar-demo.ts index a2af3059e757..e9aec5717bf4 100644 --- a/src/demo-app/progress-bar/progress-bar-demo.ts +++ b/src/demo-app/progress-bar/progress-bar-demo.ts @@ -5,7 +5,7 @@ import {MdProgressBar} from '@angular2-material/progress-bar/progress-bar'; // TODO(josephperrott): Add an automatically filling example progress bar. @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'progress-bar-demo', templateUrl: 'progress-bar-demo.html', styleUrls: ['progress-bar-demo.css'], diff --git a/src/demo-app/progress-circle/progress-circle-demo.ts b/src/demo-app/progress-circle/progress-circle-demo.ts index fae8f7a0c33c..c3edd1f73d9b 100644 --- a/src/demo-app/progress-circle/progress-circle-demo.ts +++ b/src/demo-app/progress-circle/progress-circle-demo.ts @@ -3,7 +3,7 @@ import {MdButton} from '@angular2-material/button/button'; import {MdProgressCircle, MdSpinner} from '@angular2-material/progress-circle/progress-circle'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'progress-circle-demo', templateUrl: 'progress-circle-demo.html', styleUrls: ['progress-circle-demo.css'], diff --git a/src/demo-app/radio/radio-demo.ts b/src/demo-app/radio/radio-demo.ts index ea119ff248c4..22e9e546c611 100644 --- a/src/demo-app/radio/radio-demo.ts +++ b/src/demo-app/radio/radio-demo.ts @@ -8,7 +8,7 @@ import { } from '@angular2-material/core/coordination/unique-selection-dispatcher'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'radio-demo', templateUrl: 'radio-demo.html', styleUrls: ['radio-demo.css'], diff --git a/src/demo-app/ripple/ripple-demo.ts b/src/demo-app/ripple/ripple-demo.ts index 7f96f3cca39d..f9725266f38c 100644 --- a/src/demo-app/ripple/ripple-demo.ts +++ b/src/demo-app/ripple/ripple-demo.ts @@ -14,7 +14,7 @@ import { import {MD_RIPPLE_DIRECTIVES, MdRipple} from '@angular2-material/core/core'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'ripple-demo', templateUrl: 'ripple-demo.html', styleUrls: ['ripple-demo.css'], diff --git a/src/demo-app/sidenav/sidenav-demo.ts b/src/demo-app/sidenav/sidenav-demo.ts index c894c6eb4a86..4070a7a53593 100644 --- a/src/demo-app/sidenav/sidenav-demo.ts +++ b/src/demo-app/sidenav/sidenav-demo.ts @@ -3,7 +3,7 @@ import {MdButton} from '@angular2-material/button/button'; import {MD_SIDENAV_DIRECTIVES} from '@angular2-material/sidenav/sidenav'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'sidenav-demo', templateUrl: 'sidenav-demo.html', styleUrls: ['sidenav-demo.css'], diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.ts b/src/demo-app/slide-toggle/slide-toggle-demo.ts index b71fc10b9262..39559f0948de 100644 --- a/src/demo-app/slide-toggle/slide-toggle-demo.ts +++ b/src/demo-app/slide-toggle/slide-toggle-demo.ts @@ -3,7 +3,7 @@ import {FORM_DIRECTIVES} from '@angular/forms'; import {MdSlideToggle} from '@angular2-material/slide-toggle/slide-toggle'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'switch-demo', templateUrl: 'slide-toggle-demo.html', styleUrls: ['slide-toggle-demo.css'], diff --git a/src/demo-app/slider/slider-demo.ts b/src/demo-app/slider/slider-demo.ts index 45f2ee77a438..eb0e629a938b 100644 --- a/src/demo-app/slider/slider-demo.ts +++ b/src/demo-app/slider/slider-demo.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {MD_SLIDER_DIRECTIVES} from '@angular2-material/slider/slider'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'slider-demo', templateUrl: 'slider-demo.html', }) diff --git a/src/demo-app/tabs/tab-group-demo.ts b/src/demo-app/tabs/tab-group-demo.ts index 48ddd9ae1683..f62941a4c618 100644 --- a/src/demo-app/tabs/tab-group-demo.ts +++ b/src/demo-app/tabs/tab-group-demo.ts @@ -7,7 +7,7 @@ import {MdInput} from '@angular2-material/input/input'; import {Observable} from 'rxjs/Observable'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'tab-group-demo', templateUrl: 'tab-group-demo.html', styleUrls: ['tab-group-demo.css'], diff --git a/src/demo-app/toolbar/toolbar-demo.ts b/src/demo-app/toolbar/toolbar-demo.ts index 10270d9dbd00..b27acede0317 100644 --- a/src/demo-app/toolbar/toolbar-demo.ts +++ b/src/demo-app/toolbar/toolbar-demo.ts @@ -3,7 +3,7 @@ import {MdIcon} from '@angular2-material/icon/icon'; import {MdToolbar} from '@angular2-material/toolbar/toolbar'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'toolbar-demo', templateUrl: 'toolbar-demo.html', styleUrls: ['toolbar-demo.css'], diff --git a/src/demo-app/tooltip/tooltip-demo.ts b/src/demo-app/tooltip/tooltip-demo.ts index 393a5b4e6fa4..d322a942f94c 100644 --- a/src/demo-app/tooltip/tooltip-demo.ts +++ b/src/demo-app/tooltip/tooltip-demo.ts @@ -7,7 +7,7 @@ import {MdUniqueSelectionDispatcher} from import {MD_BUTTON_DIRECTIVES} from '@angular2-material/button/button'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'tooltip-demo', templateUrl: 'tooltip-demo.html', styleUrls: ['tooltip-demo.css'], diff --git a/src/e2e-app/button/button-e2e.ts b/src/e2e-app/button/button-e2e.ts index 4dfb19deaa1c..4f9cf67d30cf 100644 --- a/src/e2e-app/button/button-e2e.ts +++ b/src/e2e-app/button/button-e2e.ts @@ -3,7 +3,7 @@ import {MdButton, MdAnchor} from '@angular2-material/button/button'; import {MdIcon} from '@angular2-material/icon/icon'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'button-e2e', templateUrl: 'button-e2e.html', directives: [MdButton, MdAnchor, MdIcon] diff --git a/src/e2e-app/e2e-app/e2e-app.ts b/src/e2e-app/e2e-app/e2e-app.ts index 865f3485a127..0a48fb7a85d5 100644 --- a/src/e2e-app/e2e-app/e2e-app.ts +++ b/src/e2e-app/e2e-app/e2e-app.ts @@ -10,7 +10,7 @@ import {ROUTER_DIRECTIVES} from '@angular/router'; export class Home {} @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'e2e-app', providers: [], templateUrl: 'e2e-app.html', diff --git a/src/e2e-app/icon/icon-e2e.ts b/src/e2e-app/icon/icon-e2e.ts index ab9646794106..812937a1df65 100644 --- a/src/e2e-app/icon/icon-e2e.ts +++ b/src/e2e-app/icon/icon-e2e.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {MD_ICON_DIRECTIVES} from '@angular2-material/icon/icon'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'icon-e2e', templateUrl: 'icon-e2e.html', directives: [MD_ICON_DIRECTIVES] diff --git a/src/e2e-app/menu/menu-e2e.ts b/src/e2e-app/menu/menu-e2e.ts index f397063f18ab..2e552c0f5d2d 100644 --- a/src/e2e-app/menu/menu-e2e.ts +++ b/src/e2e-app/menu/menu-e2e.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {MD_MENU_DIRECTIVES} from '@angular2-material/menu/menu'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'menu-e2e', templateUrl: 'menu-e2e.html', directives: [MD_MENU_DIRECTIVES], diff --git a/src/e2e-app/tabs/tabs-e2e.ts b/src/e2e-app/tabs/tabs-e2e.ts index d926ea609f7c..3fa0188dedc7 100644 --- a/src/e2e-app/tabs/tabs-e2e.ts +++ b/src/e2e-app/tabs/tabs-e2e.ts @@ -2,7 +2,7 @@ import {Component} from '@angular/core'; import {MD_TABS_DIRECTIVES} from '@angular2-material/tabs/tabs'; @Component({ - //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE //MODULE moduleId: module.id, + moduleId: module.id, selector: 'tabs-e2e', templateUrl: 'tabs-e2e.html', directives: [MD_TABS_DIRECTIVES] diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js index 871382b61092..99203d688ae0 100644 --- a/test/karma-test-shim.js +++ b/test/karma-test-shim.js @@ -37,7 +37,7 @@ System.import('system-config.js').then(function() { var testing = providers[0]; var testingBrowser = providers[1]; - testing.initTestEnvironment( + testing.TestBed.initTestEnvironment( testingBrowser.BrowserDynamicTestingModule, testingBrowser.platformBrowserDynamicTesting()); }); From f29dbf241234f40a2404ef01da0446aba70672aa Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 1 Aug 2016 12:43:13 -0700 Subject: [PATCH 07/23] tests pass with new testing APIs --- src/components/button-toggle/button-toggle.spec.ts | 6 +----- src/components/button/button.spec.ts | 5 +---- src/components/checkbox/checkbox.spec.ts | 6 +----- src/components/dialog/dialog.spec.ts | 4 +--- src/components/grid-list/grid-list.spec.ts | 4 +--- src/components/icon/icon.spec.ts | 4 +--- src/components/input/input.spec.ts | 4 +--- src/components/list/list.spec.ts | 4 +--- src/components/menu/menu.spec.ts | 4 +--- src/components/progress-bar/progress-bar.spec.ts | 4 +--- src/components/progress-circle/progress-circle.spec.ts | 4 +--- src/components/radio/radio.spec.ts | 4 +--- src/components/sidenav/sidenav.spec.ts | 4 +--- src/components/slide-toggle/slide-toggle.spec.ts | 4 +--- src/components/slider/slider.spec.ts | 4 +--- src/components/tabs/tab-group.spec.ts | 6 ++---- src/components/toolbar/toolbar.spec.ts | 4 +--- src/components/tooltip/tooltip.spec.ts | 4 +--- src/core/a11y/live-announcer.spec.ts | 1 - src/core/overlay/overlay-directives.spec.ts | 1 - src/core/overlay/overlay.spec.ts | 1 - src/core/portal/portal.spec.ts | 1 - src/core/ripple/ripple.spec.ts | 1 - 23 files changed, 19 insertions(+), 65 deletions(-) diff --git a/src/components/button-toggle/button-toggle.spec.ts b/src/components/button-toggle/button-toggle.spec.ts index d5bd5e9c6cef..73f131978baf 100644 --- a/src/components/button-toggle/button-toggle.spec.ts +++ b/src/components/button-toggle/button-toggle.spec.ts @@ -5,14 +5,12 @@ import { tick, TestComponentBuilder, ComponentFixture, - //doAsyncEntryPointCompilation, TestBed, } from '@angular/core/testing'; import {NgControl, FormsModule} from '@angular/forms'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; import { - MD_BUTTON_TOGGLE_DIRECTIVES, MdButtonToggleGroup, MdButtonToggle, MdButtonToggleGroupMultiple, @@ -25,17 +23,15 @@ import { describe('MdButtonToggle', () => { let builder: TestComponentBuilder; - let dispatcher: MdUniqueSelectionDispatcher; beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdButtonToggleModule, FormsModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/button/button.spec.ts b/src/components/button/button.spec.ts index c0d64dc42e33..ba495bf9e7b9 100644 --- a/src/components/button/button.spec.ts +++ b/src/components/button/button.spec.ts @@ -1,7 +1,6 @@ import { inject, TestComponentBuilder, - //doAsyncEntryPointCompilation, async, TestBed, } from '@angular/core/testing'; @@ -10,18 +9,16 @@ import {By} from '@angular/platform-browser'; import {MdButtonModule} from './button'; -fdescribe('MdButton', () => { +describe('MdButton', () => { let builder: TestComponentBuilder; beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdButtonModule], declarations: [TestApp], - //entryComponents: [TestApp], }); TestBed.compileComponents(); - //doAsyncEntryPointCompilation(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/checkbox/checkbox.spec.ts b/src/components/checkbox/checkbox.spec.ts index 3e3b937b4e8c..16e6372985b5 100644 --- a/src/components/checkbox/checkbox.spec.ts +++ b/src/components/checkbox/checkbox.spec.ts @@ -6,11 +6,8 @@ import { TestComponentBuilder, ComponentFixture, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import { - FORM_DIRECTIVES, - NgModel, NgControl, FormsModule, } from '@angular/forms'; @@ -29,10 +26,9 @@ describe('MdCheckbox', () => { TestBed.configureTestingModule({ imports: [MdCheckboxModule, FormsModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/dialog/dialog.spec.ts b/src/components/dialog/dialog.spec.ts index f776d0028aac..3515b00a4b53 100644 --- a/src/components/dialog/dialog.spec.ts +++ b/src/components/dialog/dialog.spec.ts @@ -6,7 +6,6 @@ import { TestComponentBuilder, ComponentFixture, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import { Component, @@ -35,7 +34,6 @@ describe('MdDialog', () => { TestBed.configureTestingModule({ imports: [MdDialogModule], declarations: [TEST_COMPONENTS, DirectiveWithViewContainer], - //entryComponents: TEST_COMPONENTS, }); addProviders([ @@ -45,7 +43,7 @@ describe('MdDialog', () => { }} ]); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); let deps = [TestComponentBuilder, MdDialog]; diff --git a/src/components/grid-list/grid-list.spec.ts b/src/components/grid-list/grid-list.spec.ts index 04c0a3a28661..f16ea6ff793c 100644 --- a/src/components/grid-list/grid-list.spec.ts +++ b/src/components/grid-list/grid-list.spec.ts @@ -3,7 +3,6 @@ import { async, TestComponentBuilder, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -17,10 +16,9 @@ describe('MdGridList', () => { TestBed.configureTestingModule({ imports: [MdGridListModule], declarations: [TestGridList], - //entryComponents: [TestGridList], }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/icon/icon.spec.ts b/src/components/icon/icon.spec.ts index 127fd8a485dc..3323be0885f7 100644 --- a/src/components/icon/icon.spec.ts +++ b/src/components/icon/icon.spec.ts @@ -4,7 +4,6 @@ import { async, TestComponentBuilder, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {XHRBackend} from '@angular/http'; import {MockBackend} from '@angular/http/testing'; @@ -44,7 +43,6 @@ describe('MdIcon', () => { TestBed.configureTestingModule({ imports: [MdIconModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, }); addProviders([ @@ -52,7 +50,7 @@ describe('MdIcon', () => { {provide: XHRBackend, useExisting: MockBackend}, ]); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); let builder: TestComponentBuilder; diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts index 05638e11cd20..2e35f10c0517 100644 --- a/src/components/input/input.spec.ts +++ b/src/components/input/input.spec.ts @@ -3,7 +3,6 @@ import { inject, TestComponentBuilder, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component} from '@angular/core'; import {FormsModule} from '@angular/forms'; @@ -18,10 +17,9 @@ describe('MdInput', function () { TestBed.configureTestingModule({ imports: [MdInputModule, FormsModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], function (tcb: TestComponentBuilder) { diff --git a/src/components/list/list.spec.ts b/src/components/list/list.spec.ts index 6c8072fafe50..b47cbdf6f36f 100644 --- a/src/components/list/list.spec.ts +++ b/src/components/list/list.spec.ts @@ -3,7 +3,6 @@ import { async, TestComponentBuilder, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -16,10 +15,9 @@ describe('MdList', () => { TestBed.configureTestingModule({ imports: [MdListModule], declarations: [TestList], - //entryComponents: [TestList], }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/menu/menu.spec.ts b/src/components/menu/menu.spec.ts index 7c08953bb562..179fde918976 100644 --- a/src/components/menu/menu.spec.ts +++ b/src/components/menu/menu.spec.ts @@ -2,7 +2,6 @@ import { inject, TestComponentBuilder, TestBed, - //doAsyncEntryPointCompilation, async, } from '@angular/core/testing'; import {Component} from '@angular/core'; @@ -15,10 +14,9 @@ describe('MdMenu', () => { TestBed.configureTestingModule({ imports: [MdMenuModule], declarations: [TestList], - //entryComponents: [TestList], }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/progress-bar/progress-bar.spec.ts b/src/components/progress-bar/progress-bar.spec.ts index c542d285e1b5..2dd0dc678384 100644 --- a/src/components/progress-bar/progress-bar.spec.ts +++ b/src/components/progress-bar/progress-bar.spec.ts @@ -2,7 +2,6 @@ import { inject, TestComponentBuilder, TestBed, - //doAsyncEntryPointCompilation, async, } from '@angular/core/testing'; import {Component} from '@angular/core'; @@ -17,10 +16,9 @@ describe('MdProgressBar', () => { TestBed.configureTestingModule({ imports: [MdProgressBarModule], declarations: [TestApp], - //entryComponents: [TestApp], }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/progress-circle/progress-circle.spec.ts b/src/components/progress-circle/progress-circle.spec.ts index f1956a171de7..fc9c95848cf4 100644 --- a/src/components/progress-circle/progress-circle.spec.ts +++ b/src/components/progress-circle/progress-circle.spec.ts @@ -2,7 +2,6 @@ import { inject, TestComponentBuilder, TestBed, - //doAsyncEntryPointCompilation, async, } from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; @@ -17,10 +16,9 @@ describe('MdProgressCircular', () => { TestBed.configureTestingModule({ imports: [MdProgressCircleModule], declarations: [TestApp], - //entryComponents: [TestApp], }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/radio/radio.spec.ts b/src/components/radio/radio.spec.ts index 8ad71beb99e3..c848d97661e7 100644 --- a/src/components/radio/radio.spec.ts +++ b/src/components/radio/radio.spec.ts @@ -6,7 +6,6 @@ import { TestComponentBuilder, ComponentFixture, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {FORM_DIRECTIVES, NgControl, FormsModule} from '@angular/forms'; import {Component, DebugElement} from '@angular/core'; @@ -28,10 +27,9 @@ describe('MdRadio', () => { TestBed.configureTestingModule({ imports: [MdRadioModule, FormsModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); let injectDeps = [TestComponentBuilder, MdUniqueSelectionDispatcher]; diff --git a/src/components/sidenav/sidenav.spec.ts b/src/components/sidenav/sidenav.spec.ts index 27f78eb3dbd2..4e916f60e303 100644 --- a/src/components/sidenav/sidenav.spec.ts +++ b/src/components/sidenav/sidenav.spec.ts @@ -6,7 +6,6 @@ import { TestComponentBuilder, ComponentFixture, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {XHR} from '@angular/compiler'; import { @@ -59,10 +58,9 @@ describe('MdSidenav', () => { TestBed.configureTestingModule({ imports: [MdSidenavModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder, XHR], (tcb: TestComponentBuilder, x: XHR) => { diff --git a/src/components/slide-toggle/slide-toggle.spec.ts b/src/components/slide-toggle/slide-toggle.spec.ts index d1c16d849bb1..603207930282 100644 --- a/src/components/slide-toggle/slide-toggle.spec.ts +++ b/src/components/slide-toggle/slide-toggle.spec.ts @@ -4,7 +4,6 @@ import { TestComponentBuilder, ComponentFixture, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {By} from '@angular/platform-browser'; import {Component} from '@angular/core'; @@ -18,10 +17,9 @@ describe('MdSlideToggle', () => { TestBed.configureTestingModule({ imports: [MdSlideToggleModule, FormsModule], declarations: [SlideToggleTestApp], - //entryComponents: [SlideToggleTestApp], }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/slider/slider.spec.ts b/src/components/slider/slider.spec.ts index dfa865e34a67..ec38a6b21310 100644 --- a/src/components/slider/slider.spec.ts +++ b/src/components/slider/slider.spec.ts @@ -5,7 +5,6 @@ import { TestComponentBuilder, ComponentFixture, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component, DebugElement, ViewEncapsulation} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -21,7 +20,6 @@ describe('MdSlider', () => { TestBed.configureTestingModule({ imports: [MdSliderModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, }); addProviders([ @@ -31,7 +29,7 @@ describe('MdSlider', () => { }} ]); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/tabs/tab-group.spec.ts b/src/components/tabs/tab-group.spec.ts index 8508c58b5451..65a85f3de19c 100644 --- a/src/components/tabs/tab-group.spec.ts +++ b/src/components/tabs/tab-group.spec.ts @@ -6,7 +6,6 @@ import { TestComponentBuilder, ComponentFixture, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {MdTabGroup, MdTabsModule} from './tabs'; import {Component} from '@angular/core'; @@ -21,10 +20,9 @@ describe('MdTabGroup', () => { TestBed.configureTestingModule({ imports: [MdTabsModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { @@ -154,7 +152,7 @@ describe('MdTabGroup', () => { let fixture: ComponentFixture; beforeEach(async(() => { - builder.createAsync(AsyncTabsTestApp).then(f => fixture = f); + fixture = TestBed.createComponent(AsyncTabsTestApp); })); it('should show tabs when they are available', async(() => { diff --git a/src/components/toolbar/toolbar.spec.ts b/src/components/toolbar/toolbar.spec.ts index 354d438a7a06..24991946fe49 100644 --- a/src/components/toolbar/toolbar.spec.ts +++ b/src/components/toolbar/toolbar.spec.ts @@ -3,7 +3,6 @@ import { inject, TestComponentBuilder, TestBed, - //doAsyncEntryPointCompilation, async, } from '@angular/core/testing'; import {By} from '@angular/platform-browser'; @@ -16,10 +15,9 @@ describe('MdToolbar', () => { TestBed.configureTestingModule({ imports: [MdToolbarModule], declarations: [TestApp], - //entryComponents: [TestApp], }); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/components/tooltip/tooltip.spec.ts b/src/components/tooltip/tooltip.spec.ts index 4b182b735896..ba8fa68c0f88 100644 --- a/src/components/tooltip/tooltip.spec.ts +++ b/src/components/tooltip/tooltip.spec.ts @@ -5,7 +5,6 @@ import { TestComponentBuilder, ComponentFixture, TestBed, - //doAsyncEntryPointCompilation, } from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; @@ -23,7 +22,6 @@ describe('MdTooltip', () => { TestBed.configureTestingModule({ imports: [MdTooltipModule], declarations: [BasicTooltipDemo], - //entryComponents: [BasicTooltipDemo], }); addProviders([ @@ -33,7 +31,7 @@ describe('MdTooltip', () => { }} ]); - //doAsyncEntryPointCompilation(); + TestBed.compileComponents(); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { diff --git a/src/core/a11y/live-announcer.spec.ts b/src/core/a11y/live-announcer.spec.ts index 9689799999ed..6528868da66c 100644 --- a/src/core/a11y/live-announcer.spec.ts +++ b/src/core/a11y/live-announcer.spec.ts @@ -20,7 +20,6 @@ describe('MdLiveAnnouncer', () => { describe('with default element', () => { beforeEach(() => TestBed.configureTestingModule({ declarations: [TestApp], - //entryComponents: [TestApp], providers: [MdLiveAnnouncer] })); diff --git a/src/core/overlay/overlay-directives.spec.ts b/src/core/overlay/overlay-directives.spec.ts index 2f4ccbff4739..302701669862 100644 --- a/src/core/overlay/overlay-directives.spec.ts +++ b/src/core/overlay/overlay-directives.spec.ts @@ -23,7 +23,6 @@ describe('Overlay directives', () => { TestBed.configureTestingModule({ imports: [OverlayModule], declarations: [ConnectedOverlayDirectiveTest], - //entryComponents: [ConnectedOverlayDirectiveTest], }); addProviders([ diff --git a/src/core/overlay/overlay.spec.ts b/src/core/overlay/overlay.spec.ts index 85ba90fb465f..ea91a062a178 100644 --- a/src/core/overlay/overlay.spec.ts +++ b/src/core/overlay/overlay.spec.ts @@ -29,7 +29,6 @@ describe('Overlay', () => { TestBed.configureTestingModule({ imports: [OverlayModule, PortalModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, providers: [ {provide: OverlayContainer, useFactory: () => { overlayContainerElement = document.createElement('div'); diff --git a/src/core/portal/portal.spec.ts b/src/core/portal/portal.spec.ts index 79ca75704870..94d6aa87d61a 100644 --- a/src/core/portal/portal.spec.ts +++ b/src/core/portal/portal.spec.ts @@ -28,7 +28,6 @@ describe('Portals', () => { TestBed.configureTestingModule({ imports: [PortalModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, }); })); diff --git a/src/core/ripple/ripple.spec.ts b/src/core/ripple/ripple.spec.ts index ba20f77469c2..a755791c03be 100644 --- a/src/core/ripple/ripple.spec.ts +++ b/src/core/ripple/ripple.spec.ts @@ -71,7 +71,6 @@ describe('MdRipple', () => { TestBed.configureTestingModule({ imports: [MdRippleModule], declarations: TEST_COMPONENTS, - //entryComponents: TEST_COMPONENTS, }); })); From 5468db8d2953d3ea31de5f29943fae5f07969c7b Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 1 Aug 2016 12:55:43 -0700 Subject: [PATCH 08/23] remove unused imports --- .../button-toggle/button-toggle.spec.ts | 3 --- src/components/dialog/dialog.spec.ts | 1 - src/components/grid-list/grid-list.spec.ts | 10 +++------ src/components/grid-list/grid-list.ts | 2 +- src/components/icon/icon.spec.ts | 2 +- .../progress-bar/progress-bar.spec.ts | 2 +- .../progress-circle/progress-circle.spec.ts | 9 ++------ src/components/radio/radio.spec.ts | 21 ++++++++---------- src/components/sidenav/sidenav.spec.ts | 22 ++++++++----------- src/components/toolbar/toolbar.spec.ts | 2 +- src/components/tooltip/tooltip.spec.ts | 5 ++--- src/core/overlay/overlay.spec.ts | 1 - src/core/portal/portal.spec.ts | 2 +- src/demo-app/baseline/baseline-demo.ts | 12 ---------- src/demo-app/button/button-demo.ts | 3 +-- src/demo-app/card/card-demo.ts | 3 +-- src/demo-app/checkbox/checkbox-demo.ts | 4 +--- src/demo-app/grid-list/grid-list-demo.ts | 8 ++----- src/demo-app/icon/icon-demo.ts | 2 +- src/demo-app/input/input-demo.ts | 8 ------- src/demo-app/list/list-demo.ts | 5 +---- src/demo-app/main.ts | 4 ++++ src/demo-app/menu/menu-demo.ts | 5 +---- src/demo-app/overlay/overlay-demo.ts | 7 ++---- src/demo-app/portal/portal-demo.ts | 2 -- .../progress-bar/progress-bar-demo.ts | 3 +-- .../progress-circle/progress-circle-demo.ts | 3 +-- src/demo-app/radio/radio-demo.ts | 9 +------- src/demo-app/ripple/ripple-demo.ts | 18 +++------------ src/demo-app/sidenav/sidenav-demo.ts | 3 +-- .../slide-toggle/slide-toggle-demo.ts | 3 +-- src/demo-app/slider/slider-demo.ts | 2 +- src/demo-app/tabs/tab-group-demo.ts | 7 ++---- src/demo-app/toolbar/toolbar-demo.ts | 3 +-- src/demo-app/tooltip/tooltip-demo.ts | 8 ++----- 35 files changed, 58 insertions(+), 146 deletions(-) diff --git a/src/components/button-toggle/button-toggle.spec.ts b/src/components/button-toggle/button-toggle.spec.ts index 73f131978baf..fabbbd3d1e46 100644 --- a/src/components/button-toggle/button-toggle.spec.ts +++ b/src/components/button-toggle/button-toggle.spec.ts @@ -16,9 +16,6 @@ import { MdButtonToggleGroupMultiple, MdButtonToggleChange, MdButtonToggleModule, } from './button-toggle'; -import { - MdUniqueSelectionDispatcher -} from '@angular2-material/core/coordination/unique-selection-dispatcher'; describe('MdButtonToggle', () => { diff --git a/src/components/dialog/dialog.spec.ts b/src/components/dialog/dialog.spec.ts index 3515b00a4b53..1cb7217c0561 100644 --- a/src/components/dialog/dialog.spec.ts +++ b/src/components/dialog/dialog.spec.ts @@ -15,7 +15,6 @@ import { ChangeDetectorRef, } from '@angular/core'; import {MdDialog, MdDialogModule} from './dialog'; -import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay'; import {OverlayContainer} from '@angular2-material/core/overlay/overlay-container'; import {MdDialogConfig} from './dialog-config'; import {MdDialogRef} from './dialog-ref'; diff --git a/src/components/grid-list/grid-list.spec.ts b/src/components/grid-list/grid-list.spec.ts index f16ea6ff793c..4150d88a751d 100644 --- a/src/components/grid-list/grid-list.spec.ts +++ b/src/components/grid-list/grid-list.spec.ts @@ -1,14 +1,10 @@ -import { - inject, - async, - TestComponentBuilder, - TestBed, -} from '@angular/core/testing'; +import {inject, async, TestComponentBuilder, TestBed} from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MD_GRID_LIST_DIRECTIVES, MdGridList, MdGridListModule} from './grid-list'; +import {MdGridList, MdGridListModule} from './grid-list'; import {MdGridTile, MdGridTileText} from './grid-tile'; + describe('MdGridList', () => { let builder: TestComponentBuilder; diff --git a/src/components/grid-list/grid-list.ts b/src/components/grid-list/grid-list.ts index b7ffd0675591..d723f199504b 100644 --- a/src/components/grid-list/grid-list.ts +++ b/src/components/grid-list/grid-list.ts @@ -21,7 +21,7 @@ import { } from './tile-styler'; import {MdGridListColsError} from './grid-list-errors'; import {Dir} from '@angular2-material/core/rtl/dir'; -import {MdLine, MdLineModule} from '@angular2-material/core/line/line'; +import {MdLineModule} from '@angular2-material/core/line/line'; import {coerceToString, coerceToNumber} from './grid-list-measure'; // TODO(kara): Conditional (responsive) column count / row size. diff --git a/src/components/icon/icon.spec.ts b/src/components/icon/icon.spec.ts index 3323be0885f7..dbcf8366a3fb 100644 --- a/src/components/icon/icon.spec.ts +++ b/src/components/icon/icon.spec.ts @@ -8,7 +8,7 @@ import { import {XHRBackend} from '@angular/http'; import {MockBackend} from '@angular/http/testing'; import {Component} from '@angular/core'; -import {MdIcon, MdIconModule} from './icon'; +import {MdIconModule} from './icon'; import {MdIconRegistry} from './icon-registry'; import {getFakeSvgHttpResponse} from './fake-svgs'; diff --git a/src/components/progress-bar/progress-bar.spec.ts b/src/components/progress-bar/progress-bar.spec.ts index 2dd0dc678384..0c4642c1e151 100644 --- a/src/components/progress-bar/progress-bar.spec.ts +++ b/src/components/progress-bar/progress-bar.spec.ts @@ -6,7 +6,7 @@ import { } from '@angular/core/testing'; import {Component} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MdProgressBar, MdProgressBarModule} from './progress-bar'; +import {MdProgressBarModule} from './progress-bar'; describe('MdProgressBar', () => { diff --git a/src/components/progress-circle/progress-circle.spec.ts b/src/components/progress-circle/progress-circle.spec.ts index fc9c95848cf4..63ccf546b817 100644 --- a/src/components/progress-circle/progress-circle.spec.ts +++ b/src/components/progress-circle/progress-circle.spec.ts @@ -1,12 +1,7 @@ -import { - inject, - TestComponentBuilder, - TestBed, - async, -} from '@angular/core/testing'; +import {inject, TestComponentBuilder, TestBed, async} from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MdProgressCircle, MdProgressCircleModule} from './progress-circle'; +import {MdProgressCircleModule} from './progress-circle'; describe('MdProgressCircular', () => { diff --git a/src/components/radio/radio.spec.ts b/src/components/radio/radio.spec.ts index c848d97661e7..be40ceb1e749 100644 --- a/src/components/radio/radio.spec.ts +++ b/src/components/radio/radio.spec.ts @@ -1,19 +1,16 @@ import { - inject, - async, - fakeAsync, - tick, - TestComponentBuilder, - ComponentFixture, - TestBed, + inject, + async, + fakeAsync, + tick, + TestComponentBuilder, + ComponentFixture, + TestBed, } from '@angular/core/testing'; -import {FORM_DIRECTIVES, NgControl, FormsModule} from '@angular/forms'; +import {NgControl, FormsModule} from '@angular/forms'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import { - MD_RADIO_DIRECTIVES, MdRadioGroup, MdRadioButton, MdRadioChange, - MdRadioModule -} from './radio'; +import {MdRadioGroup, MdRadioButton, MdRadioChange, MdRadioModule} from './radio'; import { MdUniqueSelectionDispatcher } from '@angular2-material/core/coordination/unique-selection-dispatcher'; diff --git a/src/components/sidenav/sidenav.spec.ts b/src/components/sidenav/sidenav.spec.ts index 4e916f60e303..0ea692fc5f82 100644 --- a/src/components/sidenav/sidenav.spec.ts +++ b/src/components/sidenav/sidenav.spec.ts @@ -1,20 +1,16 @@ import { - fakeAsync, - async, - inject, - tick, - TestComponentBuilder, - ComponentFixture, - TestBed, + fakeAsync, + async, + inject, + tick, + TestComponentBuilder, + ComponentFixture, + TestBed, } from '@angular/core/testing'; import {XHR} from '@angular/compiler'; -import { - Component, - ViewMetadata -} from '@angular/core'; - +import {Component, ViewMetadata} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MdSidenav, MdSidenavLayout, MD_SIDENAV_DIRECTIVES, MdSidenavModule} from './sidenav'; +import {MdSidenav, MdSidenavLayout, MdSidenavModule} from './sidenav'; /** diff --git a/src/components/toolbar/toolbar.spec.ts b/src/components/toolbar/toolbar.spec.ts index 24991946fe49..3008bcaf6eac 100644 --- a/src/components/toolbar/toolbar.spec.ts +++ b/src/components/toolbar/toolbar.spec.ts @@ -6,7 +6,7 @@ import { async, } from '@angular/core/testing'; import {By} from '@angular/platform-browser'; -import {MdToolbar, MdToolbarModule} from './toolbar'; +import {MdToolbarModule} from './toolbar'; describe('MdToolbar', () => { let builder: TestComponentBuilder; diff --git a/src/components/tooltip/tooltip.spec.ts b/src/components/tooltip/tooltip.spec.ts index ba8fa68c0f88..9863f148880a 100644 --- a/src/components/tooltip/tooltip.spec.ts +++ b/src/components/tooltip/tooltip.spec.ts @@ -8,12 +8,11 @@ import { } from '@angular/core/testing'; import {Component, DebugElement} from '@angular/core'; import {By} from '@angular/platform-browser'; -import {MD_TOOLTIP_DIRECTIVES, TooltipPosition, MdTooltip} from - '@angular2-material/tooltip/tooltip'; -import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay'; +import {TooltipPosition, MdTooltip} from '@angular2-material/tooltip/tooltip'; import {OverlayContainer} from '@angular2-material/core/overlay/overlay-container'; import {MdTooltipModule} from './tooltip'; + describe('MdTooltip', () => { let builder: TestComponentBuilder; let overlayContainerElement: HTMLElement; diff --git a/src/core/overlay/overlay.spec.ts b/src/core/overlay/overlay.spec.ts index ea91a062a178..4763f568fe0e 100644 --- a/src/core/overlay/overlay.spec.ts +++ b/src/core/overlay/overlay.spec.ts @@ -2,7 +2,6 @@ import { inject, fakeAsync, flushMicrotasks, - addProviders, TestComponentBuilder, TestBed, async, diff --git a/src/core/portal/portal.spec.ts b/src/core/portal/portal.spec.ts index 94d6aa87d61a..68ffa98d79a5 100644 --- a/src/core/portal/portal.spec.ts +++ b/src/core/portal/portal.spec.ts @@ -16,7 +16,7 @@ import { Optional, Injector, } from '@angular/core'; -import {TemplatePortalDirective, PortalHostDirective, PortalModule} from './portal-directives'; +import {TemplatePortalDirective, PortalModule} from './portal-directives'; import {Portal, ComponentPortal} from './portal'; import {DomPortalHost} from './dom-portal-host'; diff --git a/src/demo-app/baseline/baseline-demo.ts b/src/demo-app/baseline/baseline-demo.ts index 7f571c6dd9e9..e5466fbba37c 100644 --- a/src/demo-app/baseline/baseline-demo.ts +++ b/src/demo-app/baseline/baseline-demo.ts @@ -1,15 +1,4 @@ import {Component} from '@angular/core'; -import {MD_INPUT_DIRECTIVES} from '@angular2-material/input/input'; -import {MD_BUTTON_DIRECTIVES} from '@angular2-material/button/button'; -import {MD_CARD_DIRECTIVES} from '@angular2-material/card/card'; -import {MD_CHECKBOX_DIRECTIVES} from '@angular2-material/checkbox/checkbox'; -import {MD_RADIO_DIRECTIVES} from '@angular2-material/radio/radio'; -import {MdIcon} from '@angular2-material/icon/icon'; -import {MdToolbar} from '@angular2-material/toolbar/toolbar'; - -import { - MdUniqueSelectionDispatcher -} from '@angular2-material/core/coordination/unique-selection-dispatcher'; @Component({ @@ -17,7 +6,6 @@ import { selector: 'baseline-demo', templateUrl: 'baseline-demo.html', styleUrls: ['baseline-demo.css'], - providers: [MdUniqueSelectionDispatcher], }) export class BaselineDemo { name: string; diff --git a/src/demo-app/button/button-demo.ts b/src/demo-app/button/button-demo.ts index 47e77f4f3d9e..da8fa5c02e37 100644 --- a/src/demo-app/button/button-demo.ts +++ b/src/demo-app/button/button-demo.ts @@ -1,6 +1,5 @@ import {Component} from '@angular/core'; -import {MdButton, MdAnchor} from '@angular2-material/button/button'; -import {MdIcon} from '@angular2-material/icon/icon'; + @Component({ moduleId: module.id, diff --git a/src/demo-app/card/card-demo.ts b/src/demo-app/card/card-demo.ts index 47ee16f0b645..590761f8a310 100644 --- a/src/demo-app/card/card-demo.ts +++ b/src/demo-app/card/card-demo.ts @@ -1,6 +1,5 @@ import {Component} from '@angular/core'; -import {MdButton} from '@angular2-material/button/button'; -import {MD_CARD_DIRECTIVES} from '@angular2-material/card/card'; + @Component({ moduleId: module.id, diff --git a/src/demo-app/checkbox/checkbox-demo.ts b/src/demo-app/checkbox/checkbox-demo.ts index cb7b9605ba4e..edab7a8fa15c 100644 --- a/src/demo-app/checkbox/checkbox-demo.ts +++ b/src/demo-app/checkbox/checkbox-demo.ts @@ -1,7 +1,5 @@ import {Component} from '@angular/core'; -import {NgFor} from '@angular/common'; -import {FORM_DIRECTIVES} from '@angular/forms'; -import {MdCheckbox} from '@angular2-material/checkbox/checkbox'; + export interface Task { name: string; diff --git a/src/demo-app/grid-list/grid-list-demo.ts b/src/demo-app/grid-list/grid-list-demo.ts index e5dcae48b0eb..3ff2db093760 100644 --- a/src/demo-app/grid-list/grid-list-demo.ts +++ b/src/demo-app/grid-list/grid-list-demo.ts @@ -1,10 +1,6 @@ import {Component} from '@angular/core'; -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'; -import {MdIcon, MdIconRegistry} from '@angular2-material/icon/icon'; +import {MdIconRegistry} from '@angular2-material/icon/icon'; + @Component({ moduleId: module.id, diff --git a/src/demo-app/icon/icon-demo.ts b/src/demo-app/icon/icon-demo.ts index 23546d8d2af5..6ee247a18034 100644 --- a/src/demo-app/icon/icon-demo.ts +++ b/src/demo-app/icon/icon-demo.ts @@ -1,5 +1,5 @@ import {Component, ViewEncapsulation} from '@angular/core'; -import {MdIcon, MdIconRegistry} from '@angular2-material/icon/icon'; +import {MdIconRegistry} from '@angular2-material/icon/icon'; @Component({ moduleId: module.id, diff --git a/src/demo-app/input/input-demo.ts b/src/demo-app/input/input-demo.ts index 0b15cdba8bff..36891a409f01 100644 --- a/src/demo-app/input/input-demo.ts +++ b/src/demo-app/input/input-demo.ts @@ -1,12 +1,4 @@ import {Component} from '@angular/core'; -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'; -import {MdCheckbox} from '@angular2-material/checkbox/checkbox'; -import {MdIcon} from '@angular2-material/icon/icon'; -import {MdToolbar} from '@angular2-material/toolbar/toolbar'; let max = 5; diff --git a/src/demo-app/list/list-demo.ts b/src/demo-app/list/list-demo.ts index 50026b5d5146..73ed3ceee7b6 100644 --- a/src/demo-app/list/list-demo.ts +++ b/src/demo-app/list/list-demo.ts @@ -1,8 +1,5 @@ import {Component} from '@angular/core'; -import {NgIf, NgFor} from '@angular/common'; -import {MdButton} from '@angular2-material/button/button'; -import {MD_LIST_DIRECTIVES} from '@angular2-material/list/list'; -import {MdIcon} from '@angular2-material/icon/icon'; + @Component({ moduleId: module.id, diff --git a/src/demo-app/main.ts b/src/demo-app/main.ts index 34f0888c2e0f..efcb7431b310 100644 --- a/src/demo-app/main.ts +++ b/src/demo-app/main.ts @@ -36,6 +36,9 @@ import {OverlayModule} from '@angular2-material/core/overlay/overlay-directives' import {MdMenuModule} from '@angular2-material/menu/menu'; import {MdDialogModule} from '@angular2-material/dialog/dialog'; import {RtlModule} from '@angular2-material/core/rtl/dir'; +import { + MdUniqueSelectionDispatcher +} from '@angular2-material/core/coordination/unique-selection-dispatcher'; @@ -109,6 +112,7 @@ export class MaterialModule { } {provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig}, MdIconRegistry, OverlayContainer, + MdUniqueSelectionDispatcher, ], declarations: [ DemoApp, diff --git a/src/demo-app/menu/menu-demo.ts b/src/demo-app/menu/menu-demo.ts index 6ea2956899d4..1d0d04bba99e 100644 --- a/src/demo-app/menu/menu-demo.ts +++ b/src/demo-app/menu/menu-demo.ts @@ -1,8 +1,5 @@ import {Component} from '@angular/core'; -import {MD_MENU_DIRECTIVES} from '@angular2-material/menu/menu'; -import {MD_ICON_DIRECTIVES} from '@angular2-material/icon/icon'; -import {MD_BUTTON_DIRECTIVES} from '@angular2-material/button/button'; -import {MD_TOOLBAR_DIRECTIVES} from '@angular2-material/toolbar/toolbar'; + @Component({ moduleId: module.id, diff --git a/src/demo-app/overlay/overlay-demo.ts b/src/demo-app/overlay/overlay-demo.ts index a46d53160f89..9ef1ed561636 100644 --- a/src/demo-app/overlay/overlay-demo.ts +++ b/src/demo-app/overlay/overlay-demo.ts @@ -4,19 +4,16 @@ import { QueryList, ViewEncapsulation, ViewChild, - ViewContainerRef + ViewContainerRef, } from '@angular/core'; -import {NgIf} from '@angular/common'; import { Overlay, OverlayState, OverlayOrigin, OVERLAY_PROVIDERS, - OVERLAY_DIRECTIVES, ComponentPortal, Portal, - PORTAL_DIRECTIVES, - TemplatePortalDirective + TemplatePortalDirective, } from '@angular2-material/core/core'; diff --git a/src/demo-app/portal/portal-demo.ts b/src/demo-app/portal/portal-demo.ts index 8c3e5f4e0eb3..e212c1649ecd 100644 --- a/src/demo-app/portal/portal-demo.ts +++ b/src/demo-app/portal/portal-demo.ts @@ -1,10 +1,8 @@ import {Component, ViewChildren, QueryList} from '@angular/core'; -import {NgFor} from '@angular/common'; import { Portal, ComponentPortal, TemplatePortalDirective, - PortalHostDirective } from '@angular2-material/core/core'; diff --git a/src/demo-app/progress-bar/progress-bar-demo.ts b/src/demo-app/progress-bar/progress-bar-demo.ts index e9aec5717bf4..5e1501651309 100644 --- a/src/demo-app/progress-bar/progress-bar-demo.ts +++ b/src/demo-app/progress-bar/progress-bar-demo.ts @@ -1,6 +1,5 @@ import {Component} from '@angular/core'; -import {MdButton} from '@angular2-material/button/button'; -import {MdProgressBar} from '@angular2-material/progress-bar/progress-bar'; + // TODO(josephperrott): Add an automatically filling example progress bar. diff --git a/src/demo-app/progress-circle/progress-circle-demo.ts b/src/demo-app/progress-circle/progress-circle-demo.ts index c3edd1f73d9b..b520267b5da2 100644 --- a/src/demo-app/progress-circle/progress-circle-demo.ts +++ b/src/demo-app/progress-circle/progress-circle-demo.ts @@ -1,6 +1,5 @@ import {Component} from '@angular/core'; -import {MdButton} from '@angular2-material/button/button'; -import {MdProgressCircle, MdSpinner} from '@angular2-material/progress-circle/progress-circle'; + @Component({ moduleId: module.id, diff --git a/src/demo-app/radio/radio-demo.ts b/src/demo-app/radio/radio-demo.ts index 22e9e546c611..c967c1914eae 100644 --- a/src/demo-app/radio/radio-demo.ts +++ b/src/demo-app/radio/radio-demo.ts @@ -1,18 +1,11 @@ import {Component} from '@angular/core'; -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 { - MdUniqueSelectionDispatcher -} from '@angular2-material/core/coordination/unique-selection-dispatcher'; + @Component({ moduleId: module.id, selector: 'radio-demo', templateUrl: 'radio-demo.html', styleUrls: ['radio-demo.css'], - providers: [MdUniqueSelectionDispatcher], }) export class RadioDemo { isDisabled: boolean = false; diff --git a/src/demo-app/ripple/ripple-demo.ts b/src/demo-app/ripple/ripple-demo.ts index f9725266f38c..4b9f89c11a9a 100644 --- a/src/demo-app/ripple/ripple-demo.ts +++ b/src/demo-app/ripple/ripple-demo.ts @@ -1,24 +1,12 @@ -import { - Component, - ViewChild, -} from '@angular/core'; -import {MD_BUTTON_DIRECTIVES} from '@angular2-material/button/button'; -import {MD_CARD_DIRECTIVES} from '@angular2-material/card/card'; -import {MD_CHECKBOX_DIRECTIVES} from '@angular2-material/checkbox/checkbox'; -import {MD_ICON_DIRECTIVES} from '@angular2-material/icon/icon'; -import {MD_INPUT_DIRECTIVES} from '@angular2-material/input/input'; -import {MD_RADIO_DIRECTIVES} from '@angular2-material/radio/radio'; -import { - MdUniqueSelectionDispatcher -} from '@angular2-material/core/coordination/unique-selection-dispatcher'; -import {MD_RIPPLE_DIRECTIVES, MdRipple} from '@angular2-material/core/core'; +import {Component, ViewChild} from '@angular/core'; +import {MdRipple} from '@angular2-material/core/core'; + @Component({ moduleId: module.id, selector: 'ripple-demo', templateUrl: 'ripple-demo.html', styleUrls: ['ripple-demo.css'], - providers: [MdUniqueSelectionDispatcher], }) export class RippleDemo { @ViewChild(MdRipple) manualRipple: MdRipple; diff --git a/src/demo-app/sidenav/sidenav-demo.ts b/src/demo-app/sidenav/sidenav-demo.ts index 4070a7a53593..6a689378c86b 100644 --- a/src/demo-app/sidenav/sidenav-demo.ts +++ b/src/demo-app/sidenav/sidenav-demo.ts @@ -1,6 +1,5 @@ import {Component} from '@angular/core'; -import {MdButton} from '@angular2-material/button/button'; -import {MD_SIDENAV_DIRECTIVES} from '@angular2-material/sidenav/sidenav'; + @Component({ moduleId: module.id, diff --git a/src/demo-app/slide-toggle/slide-toggle-demo.ts b/src/demo-app/slide-toggle/slide-toggle-demo.ts index 39559f0948de..df1f749cd09a 100644 --- a/src/demo-app/slide-toggle/slide-toggle-demo.ts +++ b/src/demo-app/slide-toggle/slide-toggle-demo.ts @@ -1,6 +1,5 @@ import {Component} from '@angular/core'; -import {FORM_DIRECTIVES} from '@angular/forms'; -import {MdSlideToggle} from '@angular2-material/slide-toggle/slide-toggle'; + @Component({ moduleId: module.id, diff --git a/src/demo-app/slider/slider-demo.ts b/src/demo-app/slider/slider-demo.ts index eb0e629a938b..3e9930572e33 100644 --- a/src/demo-app/slider/slider-demo.ts +++ b/src/demo-app/slider/slider-demo.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {MD_SLIDER_DIRECTIVES} from '@angular2-material/slider/slider'; + @Component({ moduleId: module.id, diff --git a/src/demo-app/tabs/tab-group-demo.ts b/src/demo-app/tabs/tab-group-demo.ts index f62941a4c618..12765490200a 100644 --- a/src/demo-app/tabs/tab-group-demo.ts +++ b/src/demo-app/tabs/tab-group-demo.ts @@ -1,11 +1,8 @@ import {Component, ViewEncapsulation} from '@angular/core'; -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'; +import {AsyncPipe} from '@angular/common'; import {Observable} from 'rxjs/Observable'; + @Component({ moduleId: module.id, selector: 'tab-group-demo', diff --git a/src/demo-app/toolbar/toolbar-demo.ts b/src/demo-app/toolbar/toolbar-demo.ts index b27acede0317..31af9c1cbcbb 100644 --- a/src/demo-app/toolbar/toolbar-demo.ts +++ b/src/demo-app/toolbar/toolbar-demo.ts @@ -1,6 +1,5 @@ import {Component} from '@angular/core'; -import {MdIcon} from '@angular2-material/icon/icon'; -import {MdToolbar} from '@angular2-material/toolbar/toolbar'; + @Component({ moduleId: module.id, diff --git a/src/demo-app/tooltip/tooltip-demo.ts b/src/demo-app/tooltip/tooltip-demo.ts index d322a942f94c..56dedc97c489 100644 --- a/src/demo-app/tooltip/tooltip-demo.ts +++ b/src/demo-app/tooltip/tooltip-demo.ts @@ -1,10 +1,6 @@ import {Component} from '@angular/core'; -import {MD_TOOLTIP_DIRECTIVES, TooltipPosition} from '@angular2-material/tooltip/tooltip'; -import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay'; -import {MD_RADIO_DIRECTIVES} from '@angular2-material/radio/radio'; -import {MdUniqueSelectionDispatcher} from - '@angular2-material/core/coordination/unique-selection-dispatcher'; -import {MD_BUTTON_DIRECTIVES} from '@angular2-material/button/button'; +import {TooltipPosition} from '@angular2-material/tooltip/tooltip'; + @Component({ moduleId: module.id, From 9212d58701e5e840a800554f3f26b4493c900da4 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 1 Aug 2016 13:28:41 -0700 Subject: [PATCH 09/23] add logs for debuggin --- src/components/menu/menu.spec.ts | 2 ++ src/components/tabs/tab-group.spec.ts | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/menu/menu.spec.ts b/src/components/menu/menu.spec.ts index 179fde918976..3923b0a9892c 100644 --- a/src/components/menu/menu.spec.ts +++ b/src/components/menu/menu.spec.ts @@ -17,6 +17,7 @@ describe('MdMenu', () => { }); TestBed.compileComponents(); + console.log('COMPIELD COMPONNETS FOR MENU'); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { @@ -24,6 +25,7 @@ describe('MdMenu', () => { })); it('should add and remove focus class on focus/blur', async(() => { + console.log('TRYING TO RUN THE MENU TEST'); var template = ``; builder.overrideTemplate(TestList, template).createAsync(TestList).then(fixture => { expect(true).toBe(true); diff --git a/src/components/tabs/tab-group.spec.ts b/src/components/tabs/tab-group.spec.ts index 65a85f3de19c..656afdbdf798 100644 --- a/src/components/tabs/tab-group.spec.ts +++ b/src/components/tabs/tab-group.spec.ts @@ -152,6 +152,7 @@ describe('MdTabGroup', () => { let fixture: ComponentFixture; beforeEach(async(() => { + console.log('BEFORE EACH TABS TEST'); fixture = TestBed.createComponent(AsyncTabsTestApp); })); @@ -163,6 +164,7 @@ describe('MdTabGroup', () => { fixture.detectChanges(); fixture.whenStable().then(() => { + console.log('TABS TEST IS STABLE'); fixture.detectChanges(); labels = fixture.debugElement.queryAll(By.css('.md-tab-label')); expect(labels.length).toBe(2); @@ -247,7 +249,10 @@ class AsyncTabsTestApp { // Use ngOnInit because there is some issue with scheduling the async task in the constructor. ngOnInit() { this.tabs = Observable.create((observer: any) => { - requestAnimationFrame(() => observer.next(this._tabs)); + requestAnimationFrame(() => { + console.log('RAF RUNNING'); + return observer.next(this._tabs); + }); }); } } From c942c861d152072bc08cb374016f2dff6a67cb94 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 1 Aug 2016 18:15:00 -0700 Subject: [PATCH 10/23] remove console.log --- src/components/menu/menu.spec.ts | 2 -- src/components/tabs/tab-group.spec.ts | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/components/menu/menu.spec.ts b/src/components/menu/menu.spec.ts index 3923b0a9892c..179fde918976 100644 --- a/src/components/menu/menu.spec.ts +++ b/src/components/menu/menu.spec.ts @@ -17,7 +17,6 @@ describe('MdMenu', () => { }); TestBed.compileComponents(); - console.log('COMPIELD COMPONNETS FOR MENU'); })); beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { @@ -25,7 +24,6 @@ describe('MdMenu', () => { })); it('should add and remove focus class on focus/blur', async(() => { - console.log('TRYING TO RUN THE MENU TEST'); var template = ``; builder.overrideTemplate(TestList, template).createAsync(TestList).then(fixture => { expect(true).toBe(true); diff --git a/src/components/tabs/tab-group.spec.ts b/src/components/tabs/tab-group.spec.ts index 656afdbdf798..65a85f3de19c 100644 --- a/src/components/tabs/tab-group.spec.ts +++ b/src/components/tabs/tab-group.spec.ts @@ -152,7 +152,6 @@ describe('MdTabGroup', () => { let fixture: ComponentFixture; beforeEach(async(() => { - console.log('BEFORE EACH TABS TEST'); fixture = TestBed.createComponent(AsyncTabsTestApp); })); @@ -164,7 +163,6 @@ describe('MdTabGroup', () => { fixture.detectChanges(); fixture.whenStable().then(() => { - console.log('TABS TEST IS STABLE'); fixture.detectChanges(); labels = fixture.debugElement.queryAll(By.css('.md-tab-label')); expect(labels.length).toBe(2); @@ -249,10 +247,7 @@ class AsyncTabsTestApp { // Use ngOnInit because there is some issue with scheduling the async task in the constructor. ngOnInit() { this.tabs = Observable.create((observer: any) => { - requestAnimationFrame(() => { - console.log('RAF RUNNING'); - return observer.next(this._tabs); - }); + requestAnimationFrame(() => observer.next(this._tabs)); }); } } From e66516254c4a5bb4131cee37f02ade69c4d0251e Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 1 Aug 2016 18:37:15 -0700 Subject: [PATCH 11/23] clean up modules --- src/components/all/all.ts | 62 +++++++ src/components/slide-toggle/slide-toggle.ts | 6 + src/components/slider/slider.ts | 5 + src/core/overlay/overlay.ts | 1 + src/demo-app/demo-app-module.ts | 93 +++++++++++ src/demo-app/main.ts | 169 +------------------- src/demo-app/system-config.ts | 1 + 7 files changed, 169 insertions(+), 168 deletions(-) create mode 100644 src/components/all/all.ts create mode 100644 src/demo-app/demo-app-module.ts diff --git a/src/components/all/all.ts b/src/components/all/all.ts new file mode 100644 index 000000000000..a3108308becf --- /dev/null +++ b/src/components/all/all.ts @@ -0,0 +1,62 @@ +import {NgModule} from '@angular/core'; +import {MdButtonToggleModule} from '@angular2-material/button-toggle/button-toggle'; +import {MdButtonModule} from '@angular2-material/button/button'; +import {MdCheckboxModule} from '@angular2-material/checkbox/checkbox'; +import {MdRadioModule} from '@angular2-material/radio/radio'; +import {MdSlideToggleModule} from '@angular2-material/slide-toggle/slide-toggle'; +import {MdSliderModule} from '@angular2-material/slider/slider'; +import {MdSidenavModule} from '@angular2-material/sidenav/sidenav'; +import {MdListModule} from '@angular2-material/list/list'; +import {MdGridListModule} from '@angular2-material/grid-list/grid-list'; +import {MdCardModule} from '@angular2-material/card/card'; +import {MdIconModule} from '@angular2-material/icon/icon'; +import {MdProgressCircleModule} from '@angular2-material/progress-circle/progress-circle'; +import {MdProgressBarModule} from '@angular2-material/progress-bar/progress-bar'; +import {MdInputModule} from '@angular2-material/input/input'; +import {MdTabsModule} from '@angular2-material/tabs/tabs'; +import {MdToolbarModule} from '@angular2-material/toolbar/toolbar'; +import {MdTooltipModule} from '@angular2-material/tooltip/tooltip'; +import {MdRippleModule} from '@angular2-material/core/ripple/ripple'; +import {PortalModule} from '@angular2-material/core/portal/portal-directives'; +import {OverlayModule} from '@angular2-material/core/overlay/overlay-directives'; +import {MdMenuModule} from '@angular2-material/menu/menu'; +import {MdDialogModule} from '@angular2-material/dialog/dialog'; +import {RtlModule} from '@angular2-material/core/rtl/dir'; +import { + MdUniqueSelectionDispatcher +} from '@angular2-material/core/coordination/unique-selection-dispatcher'; +import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer'; + + +const MATERIAL_MODULES = [ + MdButtonModule, + MdButtonToggleModule, + MdCardModule, + MdCheckboxModule, + MdDialogModule, + MdGridListModule, + MdIconModule, + MdInputModule, + MdListModule, + MdMenuModule, + MdProgressBarModule, + MdProgressCircleModule, + MdRadioModule, + MdRippleModule, + MdSidenavModule, + MdSliderModule, + MdSlideToggleModule, + MdTabsModule, + MdToolbarModule, + MdTooltipModule, + OverlayModule, + PortalModule, + RtlModule, +]; + +@NgModule(({ + imports: MATERIAL_MODULES, + exports: MATERIAL_MODULES, + providers: [MdLiveAnnouncer] +})) +export class MaterialModule { } diff --git a/src/components/slide-toggle/slide-toggle.ts b/src/components/slide-toggle/slide-toggle.ts index 1cc5c744c9c6..1025a97777d5 100644 --- a/src/components/slide-toggle/slide-toggle.ts +++ b/src/components/slide-toggle/slide-toggle.ts @@ -10,6 +10,7 @@ import { AfterContentInit, NgModule, } from '@angular/core'; +import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser'; import { FormsModule, ControlValueAccessor, @@ -18,6 +19,8 @@ import { import {BooleanFieldValue} from '@angular2-material/core/annotations/field-value'; import {Observable} from 'rxjs/Observable'; import {applyCssTransform} from '@angular2-material/core/style/apply-transform'; +import {MdGestureConfig} from '@angular2-material/core/core'; + export const MD_SLIDE_TOGGLE_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, @@ -302,5 +305,8 @@ export const MD_SLIDE_TOGGLE_DIRECTIVES = [MdSlideToggle]; imports: [FormsModule], exports: MD_SLIDE_TOGGLE_DIRECTIVES, declarations: MD_SLIDE_TOGGLE_DIRECTIVES, + providers: [ + {provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig}, + ], }) export class MdSlideToggleModule { } diff --git a/src/components/slider/slider.ts b/src/components/slider/slider.ts index 3bc3e87deb9e..10ea4cc7469f 100644 --- a/src/components/slider/slider.ts +++ b/src/components/slider/slider.ts @@ -7,8 +7,10 @@ import { ViewEncapsulation, AfterContentInit, } from '@angular/core'; +import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser'; import {BooleanFieldValue} from '@angular2-material/core/annotations/field-value'; import {applyCssTransform} from '@angular2-material/core/style/apply-transform'; +import {MdGestureConfig} from '@angular2-material/core/core'; @Component({ moduleId: module.id, @@ -273,5 +275,8 @@ export const MD_SLIDER_DIRECTIVES = [MdSlider]; @NgModule({ exports: MD_SLIDER_DIRECTIVES, declarations: MD_SLIDER_DIRECTIVES, + providers: [ + {provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig}, + ], }) export class MdSliderModule { } diff --git a/src/core/overlay/overlay.ts b/src/core/overlay/overlay.ts index e35b94ef6fe6..b662a9317204 100644 --- a/src/core/overlay/overlay.ts +++ b/src/core/overlay/overlay.ts @@ -88,5 +88,6 @@ export const OVERLAY_PROVIDERS = [ ViewportRuler, OverlayPositionBuilder, Overlay, + OverlayContainer, ]; diff --git a/src/demo-app/demo-app-module.ts b/src/demo-app/demo-app-module.ts new file mode 100644 index 000000000000..1e811aef22c4 --- /dev/null +++ b/src/demo-app/demo-app-module.ts @@ -0,0 +1,93 @@ +import {NgModule, ApplicationRef} from '@angular/core'; +import {BrowserModule} from '@angular/platform-browser'; +import {HttpModule} from '@angular/http'; +import {FormsModule} from '@angular/forms'; +import {DemoApp, Home} from './demo-app/demo-app'; +import {DEMO_APP_ROUTE_PROVIDER} from './demo-app/routes'; +import {RouterModule} from '@angular/router'; +import {MaterialModule} from '@angular2-material/all/all'; +import {ProgressBarDemo} from './progress-bar/progress-bar-demo'; +import {JazzDialog, DialogDemo} from './dialog/dialog-demo'; +import {RippleDemo} from './ripple/ripple-demo'; +import {IconDemo} from './icon/icon-demo'; +import {GesturesDemo} from './gestures/gestures-demo'; +import {InputDemo} from './input/input-demo'; +import {CardDemo} from './card/card-demo'; +import {RadioDemo} from './radio/radio-demo'; +import {ButtonToggleDemo} from './button-toggle/button-toggle-demo'; +import {ProgressCircleDemo} from './progress-circle/progress-circle-demo'; +import {TooltipDemo} from './tooltip/tooltip-demo'; +import {ListDemo} from './list/list-demo'; +import {BaselineDemo} from './baseline/baseline-demo'; +import {GridListDemo} from './grid-list/grid-list-demo'; +import {LiveAnnouncerDemo} from './live-announcer/live-announcer-demo'; +import {OverlayDemo, SpagettiPanel, RotiniPanel} from './overlay/overlay-demo'; +import {SlideToggleDemo} from './slide-toggle/slide-toggle-demo'; +import {ToolbarDemo} from './toolbar/toolbar-demo'; +import {ButtonDemo} from './button/button-demo'; +import {MdCheckboxDemoNestedChecklist, CheckboxDemo} from './checkbox/checkbox-demo'; +import {SliderDemo} from './slider/slider-demo'; +import {SidenavDemo} from './sidenav/sidenav-demo'; +import {PortalDemo, ScienceJoke} from './portal/portal-demo'; +import {MenuDemo} from './menu/menu-demo'; +import {TabsDemo} from './tabs/tab-group-demo'; + + +@NgModule({ + imports: [ + BrowserModule, + FormsModule, + HttpModule, + MaterialModule, + RouterModule, + ], + providers: [ + DEMO_APP_ROUTE_PROVIDER, + ], + declarations: [ + BaselineDemo, + ButtonDemo, + ButtonToggleDemo, + CardDemo, + CheckboxDemo, + DemoApp, + DialogDemo, + GesturesDemo, + GridListDemo, + Home, + IconDemo, + InputDemo, + JazzDialog, + ListDemo, + LiveAnnouncerDemo, + MdCheckboxDemoNestedChecklist, + MenuDemo, + OverlayDemo, + PortalDemo, + ProgressBarDemo, + ProgressCircleDemo, + RadioDemo, + RippleDemo, + RotiniPanel, + ScienceJoke, + SidenavDemo, + SliderDemo, + SlideToggleDemo, + SpagettiPanel, + TabsDemo, + ToolbarDemo, + TooltipDemo, + ], + entryComponents: [ + DemoApp, + JazzDialog, + RotiniPanel, + ScienceJoke, + SpagettiPanel, + ], +}) +export class DemoAppModule { + constructor(appRef: ApplicationRef) { + appRef.bootstrap(DemoApp); + } +} diff --git a/src/demo-app/main.ts b/src/demo-app/main.ts index efcb7431b310..96fcced7e34c 100644 --- a/src/demo-app/main.ts +++ b/src/demo-app/main.ts @@ -1,171 +1,4 @@ -/// import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; -import {NgModule, ApplicationRef} from '@angular/core'; -import {HAMMER_GESTURE_CONFIG, BrowserModule} from '@angular/platform-browser'; -import {HttpModule} from '@angular/http'; -import {FormsModule} from '@angular/forms'; -import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer'; -import {MdGestureConfig} from '@angular2-material/core/gestures/MdGestureConfig'; -import {MdIconRegistry} from '@angular2-material/icon/icon-registry'; -import {OverlayContainer} from '@angular2-material/core/overlay/overlay-container'; -import {DemoApp, Home} from './demo-app/demo-app'; -import {DEMO_APP_ROUTE_PROVIDER} from './demo-app/routes'; -import {RouterModule} from '@angular/router'; - -// component modules -import {MdButtonToggleModule} from '@angular2-material/button-toggle/button-toggle'; -import {MdButtonModule} from '@angular2-material/button/button'; -import {MdCheckboxModule} from '@angular2-material/checkbox/checkbox'; -import {MdRadioModule} from '@angular2-material/radio/radio'; -import {MdSlideToggleModule} from '@angular2-material/slide-toggle/slide-toggle'; -import {MdSliderModule} from '@angular2-material/slider/slider'; -import {MdSidenavModule} from '@angular2-material/sidenav/sidenav'; -import {MdListModule} from '@angular2-material/list/list'; -import {MdGridListModule} from '@angular2-material/grid-list/grid-list'; -import {MdCardModule} from '@angular2-material/card/card'; -import {MdIconModule} from '@angular2-material/icon/icon'; -import {MdProgressCircleModule} from '@angular2-material/progress-circle/progress-circle'; -import {MdProgressBarModule} from '@angular2-material/progress-bar/progress-bar'; -import {MdInputModule} from '@angular2-material/input/input'; -import {MdTabsModule} from '@angular2-material/tabs/tabs'; -import {MdToolbarModule} from '@angular2-material/toolbar/toolbar'; -import {MdTooltipModule} from '@angular2-material/tooltip/tooltip'; -import {MdRippleModule} from '@angular2-material/core/ripple/ripple'; -import {PortalModule} from '@angular2-material/core/portal/portal-directives'; -import {OverlayModule} from '@angular2-material/core/overlay/overlay-directives'; -import {MdMenuModule} from '@angular2-material/menu/menu'; -import {MdDialogModule} from '@angular2-material/dialog/dialog'; -import {RtlModule} from '@angular2-material/core/rtl/dir'; -import { - MdUniqueSelectionDispatcher -} from '@angular2-material/core/coordination/unique-selection-dispatcher'; - - - - -// demo components -import {ProgressBarDemo} from './progress-bar/progress-bar-demo'; -import {JazzDialog, DialogDemo} from './dialog/dialog-demo'; -import {RippleDemo} from './ripple/ripple-demo'; -import {IconDemo} from './icon/icon-demo'; -import {GesturesDemo} from './gestures/gestures-demo'; -import {InputDemo} from './input/input-demo'; -import {CardDemo} from './card/card-demo'; -import {RadioDemo} from './radio/radio-demo'; -import {ButtonToggleDemo} from './button-toggle/button-toggle-demo'; -import {ProgressCircleDemo} from './progress-circle/progress-circle-demo'; -import {TooltipDemo} from './tooltip/tooltip-demo'; -import {ListDemo} from './list/list-demo'; -import {BaselineDemo} from './baseline/baseline-demo'; -import {GridListDemo} from './grid-list/grid-list-demo'; -import {LiveAnnouncerDemo} from './live-announcer/live-announcer-demo'; -import {OverlayDemo, SpagettiPanel, RotiniPanel} from './overlay/overlay-demo'; -import {SlideToggleDemo} from './slide-toggle/slide-toggle-demo'; -import {ToolbarDemo} from './toolbar/toolbar-demo'; -import {ButtonDemo} from './button/button-demo'; -import {MdCheckboxDemoNestedChecklist, CheckboxDemo} from './checkbox/checkbox-demo'; -import {SliderDemo} from './slider/slider-demo'; -import {SidenavDemo} from './sidenav/sidenav-demo'; -import {PortalDemo, ScienceJoke} from './portal/portal-demo'; -import {MenuDemo} from './menu/menu-demo'; -import {TabsDemo} from './tabs/tab-group-demo'; - - - -const MATERIAL_COMPONENTS = [ - PortalModule, - OverlayModule, - RtlModule, - MdButtonModule, - MdButtonToggleModule, - MdCheckboxModule, - MdRadioModule, - MdSlideToggleModule, - MdSliderModule, - MdSidenavModule, - MdListModule, - MdGridListModule, - MdCardModule, - MdIconModule, - MdProgressCircleModule, - MdProgressBarModule, - MdInputModule, - MdTabsModule, - MdToolbarModule, - MdTooltipModule, - MdRippleModule, - MdMenuModule, - MdDialogModule, -]; - -@NgModule(({ - imports: MATERIAL_COMPONENTS, - exports: MATERIAL_COMPONENTS, -})) -export class MaterialModule { } - -@NgModule({ - imports: [BrowserModule, RouterModule, FormsModule, HttpModule, MaterialModule], - providers: [ - DEMO_APP_ROUTE_PROVIDER, - MdLiveAnnouncer, - {provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig}, - MdIconRegistry, - OverlayContainer, - MdUniqueSelectionDispatcher, - ], - declarations: [ - DemoApp, - ListDemo, - TooltipDemo, - ProgressCircleDemo, - ButtonToggleDemo, - RadioDemo, - CardDemo, - InputDemo, - GesturesDemo, - IconDemo, - RippleDemo, - DialogDemo, - JazzDialog, - Home, - ProgressBarDemo, - BaselineDemo, - GridListDemo, - LiveAnnouncerDemo, - OverlayDemo, - SlideToggleDemo, - ToolbarDemo, - ButtonDemo, - MdCheckboxDemoNestedChecklist, - CheckboxDemo, - SliderDemo, - SidenavDemo, - PortalDemo, - ScienceJoke, - MenuDemo, - TabsDemo, - SpagettiPanel, - RotiniPanel, - ], - entryComponents: [DemoApp, SpagettiPanel, RotiniPanel, JazzDialog, ScienceJoke], -}) -export class DemoAppModule { - constructor(appRef: ApplicationRef) { - appRef.bootstrap(DemoApp); - } -} - +import {DemoAppModule} from './demo-app-module'; platformBrowserDynamic().bootstrapModule(DemoAppModule); - -// bootstrap(DemoApp, [ -// DEMO_APP_ROUTE_PROVIDER, -// disableDeprecatedForms(), -// provideForms(), -// MdLiveAnnouncer, -// HTTP_PROVIDERS, -// OverlayContainer, -// MdIconRegistry, -// {provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig}, -// ]); diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts index ef20dee089dc..7d9158a0a18d 100644 --- a/src/demo-app/system-config.ts +++ b/src/demo-app/system-config.ts @@ -3,6 +3,7 @@ **********************************************************************************************/ const components = [ + 'all', 'button', 'card', 'checkbox', From 84a0a9f22d946a5f3bd68e7e8857504be9b72f09 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 1 Aug 2016 19:31:10 -0700 Subject: [PATCH 12/23] button-tgoggle-demo scss --- scripts/release/stage-release.sh | 2 -- src/demo-app/button-toggle/button-toggle-demo.scss | 3 +++ src/demo-app/button-toggle/button-toggle-demo.ts | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 src/demo-app/button-toggle/button-toggle-demo.scss diff --git a/scripts/release/stage-release.sh b/scripts/release/stage-release.sh index bdd1a2c465bc..7be808818584 100755 --- a/scripts/release/stage-release.sh +++ b/scripts/release/stage-release.sh @@ -23,8 +23,6 @@ ng build grep -lr "moduleId:" ./src/ | xargs sed -i 's|moduleId:|//MODULE moduleId:|g' -sleep 1 - # Run tsc directly first so that the output directories match what ngc is expecting. This is # different from what the CLI will output for *demo-app*, but we don't care about the output for # demo-app when we're staging a release (only components/ and core/). diff --git a/src/demo-app/button-toggle/button-toggle-demo.scss b/src/demo-app/button-toggle/button-toggle-demo.scss new file mode 100644 index 000000000000..ea6926c5f391 --- /dev/null +++ b/src/demo-app/button-toggle/button-toggle-demo.scss @@ -0,0 +1,3 @@ +.demo-button-toggle { + +} diff --git a/src/demo-app/button-toggle/button-toggle-demo.ts b/src/demo-app/button-toggle/button-toggle-demo.ts index c246b8731a9f..b2afcffc38fc 100644 --- a/src/demo-app/button-toggle/button-toggle-demo.ts +++ b/src/demo-app/button-toggle/button-toggle-demo.ts @@ -7,6 +7,7 @@ import { moduleId: module.id, selector: 'button-toggle-demo', templateUrl: 'button-toggle-demo.html', + styleUrls: ['demo-button-styles.css'], providers: [MdUniqueSelectionDispatcher], }) export class ButtonToggleDemo { From 022037abab207def200bb982e0286d927fa0aaa1 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 1 Aug 2016 20:03:46 -0700 Subject: [PATCH 13/23] add sleep to staging script --- scripts/release/stage-release.sh | 3 +++ src/demo-app/button-toggle/button-toggle-demo.scss | 3 --- src/demo-app/button-toggle/button-toggle-demo.ts | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 src/demo-app/button-toggle/button-toggle-demo.scss diff --git a/scripts/release/stage-release.sh b/scripts/release/stage-release.sh index 7be808818584..5222b8f7e9d6 100755 --- a/scripts/release/stage-release.sh +++ b/scripts/release/stage-release.sh @@ -18,6 +18,9 @@ mkdir deploy # Start off by building normally. ng build +# `ng build` does not complete synchronously, so wait a moment for it. +sleep 3 + # We need to remove moduleId for the ngc build. We do this by simply commenting out with a # distinguishing marker and then undoing those lines after we've generated the .metadata.json files. grep -lr "moduleId:" ./src/ | xargs sed -i 's|moduleId:|//MODULE moduleId:|g' diff --git a/src/demo-app/button-toggle/button-toggle-demo.scss b/src/demo-app/button-toggle/button-toggle-demo.scss deleted file mode 100644 index ea6926c5f391..000000000000 --- a/src/demo-app/button-toggle/button-toggle-demo.scss +++ /dev/null @@ -1,3 +0,0 @@ -.demo-button-toggle { - -} diff --git a/src/demo-app/button-toggle/button-toggle-demo.ts b/src/demo-app/button-toggle/button-toggle-demo.ts index b2afcffc38fc..c246b8731a9f 100644 --- a/src/demo-app/button-toggle/button-toggle-demo.ts +++ b/src/demo-app/button-toggle/button-toggle-demo.ts @@ -7,7 +7,6 @@ import { moduleId: module.id, selector: 'button-toggle-demo', templateUrl: 'button-toggle-demo.html', - styleUrls: ['demo-button-styles.css'], providers: [MdUniqueSelectionDispatcher], }) export class ButtonToggleDemo { From 74f7510012d75d15b27de2e06c6c2a5862ce6692 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 1 Aug 2016 20:29:54 -0700 Subject: [PATCH 14/23] wip ngc --- scripts/release/stage-release.sh | 8 ++++++++ src/components/tabs/tabs.ts | 2 +- src/components/tooltip/tooltip.ts | 2 +- src/demo-app/tsconfig.json | 3 +-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/release/stage-release.sh b/scripts/release/stage-release.sh index 5222b8f7e9d6..07d1fcec2c52 100755 --- a/scripts/release/stage-release.sh +++ b/scripts/release/stage-release.sh @@ -25,6 +25,11 @@ sleep 3 # distinguishing marker and then undoing those lines after we've generated the .metadata.json files. grep -lr "moduleId:" ./src/ | xargs sed -i 's|moduleId:|//MODULE moduleId:|g' +# Blech +( cd dist ; find ./components/ -iname "*.css" | xargs -i rsync -Rq {} ../src ) +( cd dist ; find ./core/ -iname "*.css" | xargs -i rsync -Rq {} ../src ) +( cd dist ; find ./ -iname "*.css" -not -path ./components -not -path ./core | xargs -i rsync -Rq {} ../src/demo-app ) + # Run tsc directly first so that the output directories match what ngc is expecting. This is # different from what the CLI will output for *demo-app*, but we don't care about the output for @@ -62,6 +67,9 @@ cp -R ./dist/components/* ./deploy/ # Copy the core/ directory directly into ./deploy cp -R ./dist/core/ ./deploy/core/ +# Remove css files from src/ +find ./src -iname "*.css" | xargs rm + # Remove test files from deploy/ find ./deploy -iname "*.spec.d.ts" | xargs rm find ./deploy -iname "*.spec.js" | xargs rm diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts index 42e039faf45b..85db3f89480a 100644 --- a/src/components/tabs/tabs.ts +++ b/src/components/tabs/tabs.ts @@ -197,7 +197,7 @@ export class MdTabGroup { } export const MD_TABS_DIRECTIVES = [MdTabGroup, MdTabLabel, MdTabContent, MdTab]; -const TABS_INTERNAL_DIRECTIVES = [MdInkBar, MdTabLabelWrapper]; +export const TABS_INTERNAL_DIRECTIVES = [MdInkBar, MdTabLabelWrapper]; @NgModule({ imports: [CommonModule, PortalModule], diff --git a/src/components/tooltip/tooltip.ts b/src/components/tooltip/tooltip.ts index 34616c62471f..b1eb488a7afa 100644 --- a/src/components/tooltip/tooltip.ts +++ b/src/components/tooltip/tooltip.ts @@ -187,7 +187,7 @@ export class MdTooltip { template: `
{{message}}
`, styleUrls: ['tooltip.css'], }) -class TooltipComponent { +export class TooltipComponent { message: string; } diff --git a/src/demo-app/tsconfig.json b/src/demo-app/tsconfig.json index e7f03b00d9c9..3653c47f84f4 100644 --- a/src/demo-app/tsconfig.json +++ b/src/demo-app/tsconfig.json @@ -27,8 +27,7 @@ } }, "angularCompilerOptions": { - "genDir": "../../dist", - "skipTemplateCodegen": true, + "genDir": "../generated", "debug": true }, "files": [ From c29a03118e7441b4f5d06602d066518d348eaaa8 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 1 Aug 2016 21:26:14 -0700 Subject: [PATCH 15/23] fix incorrectly private members --- scripts/release/stage-release.sh | 8 +------- src/components/dialog/dialog-container.ts | 2 +- src/components/menu/menu-directive.ts | 4 ++-- src/components/slide-toggle/slide-toggle.ts | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/scripts/release/stage-release.sh b/scripts/release/stage-release.sh index 07d1fcec2c52..e0a951e72efc 100755 --- a/scripts/release/stage-release.sh +++ b/scripts/release/stage-release.sh @@ -19,18 +19,12 @@ mkdir deploy ng build # `ng build` does not complete synchronously, so wait a moment for it. -sleep 3 +sleep 2 # We need to remove moduleId for the ngc build. We do this by simply commenting out with a # distinguishing marker and then undoing those lines after we've generated the .metadata.json files. grep -lr "moduleId:" ./src/ | xargs sed -i 's|moduleId:|//MODULE moduleId:|g' -# Blech -( cd dist ; find ./components/ -iname "*.css" | xargs -i rsync -Rq {} ../src ) -( cd dist ; find ./core/ -iname "*.css" | xargs -i rsync -Rq {} ../src ) -( cd dist ; find ./ -iname "*.css" -not -path ./components -not -path ./core | xargs -i rsync -Rq {} ../src/demo-app ) - - # Run tsc directly first so that the output directories match what ngc is expecting. This is # different from what the CLI will output for *demo-app*, but we don't care about the output for # demo-app when we're staging a release (only components/ and core/). diff --git a/src/components/dialog/dialog-container.ts b/src/components/dialog/dialog-container.ts index 9c52e7ddf936..27eb66f2eacf 100644 --- a/src/components/dialog/dialog-container.ts +++ b/src/components/dialog/dialog-container.ts @@ -25,7 +25,7 @@ import {MdDialogContentAlreadyAttachedError} from './dialog-errors'; }) export class MdDialogContainer extends BasePortalHost implements AfterViewInit { /** The portal host inside of this container into which the dialog content will be loaded. */ - @ViewChild(PortalHostDirective) private _portalHost: PortalHostDirective; + @ViewChild(PortalHostDirective) _portalHost: PortalHostDirective; /** * Completer used to resolve the promise for cases when a portal is attempted to be attached, diff --git a/src/components/menu/menu-directive.ts b/src/components/menu/menu-directive.ts index bac6f9181a1c..19f4ac721892 100644 --- a/src/components/menu/menu-directive.ts +++ b/src/components/menu/menu-directive.ts @@ -24,10 +24,10 @@ import {MdMenuInvalidPositionX, MdMenuInvalidPositionY} from './menu-errors'; exportAs: 'mdMenu' }) export class MdMenu { - private _showClickCatcher: boolean = false; + _showClickCatcher: boolean = false; // config object to be passed into the menu's ngClass - private _classList: Object; + _classList: Object; positionX: MenuPositionX = 'after'; positionY: MenuPositionY = 'below'; diff --git a/src/components/slide-toggle/slide-toggle.ts b/src/components/slide-toggle/slide-toggle.ts index 1025a97777d5..d8f6e5cb5891 100644 --- a/src/components/slide-toggle/slide-toggle.ts +++ b/src/components/slide-toggle/slide-toggle.ts @@ -61,7 +61,7 @@ export class MdSlideToggle implements AfterContentInit, ControlValueAccessor { private _uniqueId = `md-slide-toggle-${++nextId}`; private _checked: boolean = false; private _color: string; - private _hasFocus: boolean = false; + _hasFocus: boolean = false; private _isMousedown: boolean = false; private _slideRenderer: SlideToggleRenderer = null; From 123b410e57ac14f799839f66d351b44ceb74ebe6 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Thu, 4 Aug 2016 11:01:54 -0700 Subject: [PATCH 16/23] undo ngc config changes --- src/demo-app/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/demo-app/tsconfig.json b/src/demo-app/tsconfig.json index 3653c47f84f4..e7f03b00d9c9 100644 --- a/src/demo-app/tsconfig.json +++ b/src/demo-app/tsconfig.json @@ -27,7 +27,8 @@ } }, "angularCompilerOptions": { - "genDir": "../generated", + "genDir": "../../dist", + "skipTemplateCodegen": true, "debug": true }, "files": [ From a3f96eccce8c2449045c619fb3dbd6d6c04546f9 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Thu, 4 Aug 2016 15:32:19 -0700 Subject: [PATCH 17/23] workaround for #10503 --- package.json | 16 ++++++++-------- src/components/sidenav/sidenav.spec.ts | 4 ++-- src/core/a11y/live-announcer.spec.ts | 15 ++++++--------- src/core/overlay/overlay.spec.ts | 2 +- src/core/portal/portal.spec.ts | 8 ++++++-- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index bb1861fe4536..23aa42936874 100644 --- a/package.json +++ b/package.json @@ -28,14 +28,14 @@ "node": ">= 4.2.1 < 5" }, "dependencies": { - "@angular/common": "2.0.0-rc.4", - "@angular/compiler": "2.0.0-rc.4", - "@angular/core": "2.0.0-rc.4", - "@angular/http": "2.0.0-rc.4", - "@angular/platform-browser": "2.0.0-rc.4", - "@angular/platform-browser-dynamic": "2.0.0-rc.4", - "@angular/router": "v3.0.0-alpha.8", - "@angular/forms": "^0.2.0", + "@angular/common": "github:angular/common-builds", + "@angular/compiler": "github:angular/compiler-builds", + "@angular/core": "github:angular/core-builds", + "@angular/http": "github:angular/http-builds", + "@angular/platform-browser": "github:angular/platform-browser-builds", + "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds", + "@angular/forms": "github:angular/forms-builds", + "@angular/router": "github:angular/router-builds", "core-js": "^2.4.0", "hammerjs": "^2.0.8", "rxjs": "5.0.0-beta.6", diff --git a/src/components/sidenav/sidenav.spec.ts b/src/components/sidenav/sidenav.spec.ts index 0ea692fc5f82..6ecd48965cfe 100644 --- a/src/components/sidenav/sidenav.spec.ts +++ b/src/components/sidenav/sidenav.spec.ts @@ -59,10 +59,10 @@ describe('MdSidenav', () => { TestBed.compileComponents(); })); - beforeEach(inject([TestComponentBuilder, XHR], (tcb: TestComponentBuilder, x: XHR) => { + beforeEach(fakeAsync(inject([TestComponentBuilder, XHR], (tcb: TestComponentBuilder, x: XHR) => { builder = tcb; xhr = x; - })); + }))); /** * We need to get the template and styles for the sidenav in an Async test. diff --git a/src/core/a11y/live-announcer.spec.ts b/src/core/a11y/live-announcer.spec.ts index 6528868da66c..315a4a0e1adf 100644 --- a/src/core/a11y/live-announcer.spec.ts +++ b/src/core/a11y/live-announcer.spec.ts @@ -23,12 +23,12 @@ describe('MdLiveAnnouncer', () => { providers: [MdLiveAnnouncer] })); - beforeEach(inject([TestComponentBuilder, MdLiveAnnouncer], + beforeEach(fakeAsync(inject([TestComponentBuilder, MdLiveAnnouncer], (tcb: TestComponentBuilder, _live: MdLiveAnnouncer) => { builder = tcb; live = _live; liveEl = getLiveElement(); - })); + }))); afterEach(() => { // In our tests we always remove the current live element, because otherwise we would have @@ -36,7 +36,7 @@ describe('MdLiveAnnouncer', () => { liveEl.parentNode.removeChild(liveEl); }); - it('should correctly update the announce text', fakeAsyncTest(() => { + it('should correctly update the announce text', fakeAsync(() => { let appFixture: ComponentFixture = null; builder.createAsync(TestApp).then(fixture => { @@ -56,7 +56,7 @@ describe('MdLiveAnnouncer', () => { expect(liveEl.textContent).toBe('Test'); })); - it('should correctly update the politeness attribute', fakeAsyncTest(() => { + it('should correctly update the politeness attribute', fakeAsync(() => { let appFixture: ComponentFixture = null; builder.createAsync(TestApp).then(fixture => { @@ -74,7 +74,7 @@ describe('MdLiveAnnouncer', () => { expect(liveEl.getAttribute('aria-live')).toBe('assertive'); })); - it('should apply the aria-live value polite by default', fakeAsyncTest(() => { + it('should apply the aria-live value polite by default', fakeAsync(() => { let appFixture: ComponentFixture = null; builder.createAsync(TestApp).then(fixture => { @@ -113,7 +113,7 @@ describe('MdLiveAnnouncer', () => { })); - it('should allow to use a custom live element', fakeAsyncTest(() => { + it('should allow to use a custom live element', fakeAsync(() => { live.announce('Custom Element'); // This flushes our 100ms timeout for the screenreaders. @@ -125,9 +125,6 @@ describe('MdLiveAnnouncer', () => { }); -function fakeAsyncTest(fn: () => void) { - return inject([], fakeAsync(fn)); -} function getLiveElement(): Element { return document.body.querySelector('.md-live-announcer'); diff --git a/src/core/overlay/overlay.spec.ts b/src/core/overlay/overlay.spec.ts index 4763f568fe0e..34f864391814 100644 --- a/src/core/overlay/overlay.spec.ts +++ b/src/core/overlay/overlay.spec.ts @@ -39,7 +39,7 @@ describe('Overlay', () => { let deps = [TestComponentBuilder, Overlay]; - beforeEach(inject(deps, fakeAsync((tcb: TestComponentBuilder, o: Overlay) => { + beforeEach(fakeAsync(inject(deps, (tcb: TestComponentBuilder, o: Overlay) => { builder = tcb; overlay = o; diff --git a/src/core/portal/portal.spec.ts b/src/core/portal/portal.spec.ts index 68ffa98d79a5..89f57df3e59b 100644 --- a/src/core/portal/portal.spec.ts +++ b/src/core/portal/portal.spec.ts @@ -31,9 +31,13 @@ describe('Portals', () => { }); })); - beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { + beforeEach(fakeAsync(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => { builder = tcb; - })); + }))); + + // beforeEach(inject([TestComponentBuilder], fakeAsync((tcb: TestComponentBuilder) => { + // builder = tcb; + // }))); describe('PortalHostDirective', () => { it('should load a component into the portal', fakeAsync(() => { From 78b97f0917cfe9ff7c8c7689e1176a5b393be143 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Fri, 5 Aug 2016 10:37:59 -0700 Subject: [PATCH 18/23] workaround for tabs test --- src/components/tabs/tab-group.spec.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/tabs/tab-group.spec.ts b/src/components/tabs/tab-group.spec.ts index 65a85f3de19c..ecb947814082 100644 --- a/src/components/tabs/tab-group.spec.ts +++ b/src/components/tabs/tab-group.spec.ts @@ -151,11 +151,9 @@ describe('MdTabGroup', () => { describe('async tabs', () => { let fixture: ComponentFixture; - beforeEach(async(() => { + it('should show tabs when they are available', async(() => { fixture = TestBed.createComponent(AsyncTabsTestApp); - })); - it('should show tabs when they are available', async(() => { let labels = fixture.debugElement.queryAll(By.css('.md-tab-label')); expect(labels.length).toBe(0); From 6273f3fec46e54d2a1ab5a10fef8a36dd4910db6 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Fri, 5 Aug 2016 15:54:37 -0700 Subject: [PATCH 19/23] fix e2e app --- src/components/all/all.ts | 3 --- src/e2e-app/button/button-e2e.ts | 3 --- src/e2e-app/e2e-app-module.ts | 40 ++++++++++++++++++++++++++++++++ src/e2e-app/e2e-app/e2e-app.ts | 11 ++------- src/e2e-app/icon/icon-e2e.ts | 3 +-- src/e2e-app/main.ts | 26 ++++----------------- src/e2e-app/menu/menu-e2e.ts | 3 +-- src/e2e-app/system-config.ts | 4 ++++ src/e2e-app/tabs/tabs-e2e.ts | 2 -- 9 files changed, 52 insertions(+), 43 deletions(-) create mode 100644 src/e2e-app/e2e-app-module.ts diff --git a/src/components/all/all.ts b/src/components/all/all.ts index a3108308becf..3b7598becef8 100644 --- a/src/components/all/all.ts +++ b/src/components/all/all.ts @@ -22,9 +22,6 @@ import {OverlayModule} from '@angular2-material/core/overlay/overlay-directives' import {MdMenuModule} from '@angular2-material/menu/menu'; import {MdDialogModule} from '@angular2-material/dialog/dialog'; import {RtlModule} from '@angular2-material/core/rtl/dir'; -import { - MdUniqueSelectionDispatcher -} from '@angular2-material/core/coordination/unique-selection-dispatcher'; import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer'; diff --git a/src/e2e-app/button/button-e2e.ts b/src/e2e-app/button/button-e2e.ts index 4f9cf67d30cf..31d60593a114 100644 --- a/src/e2e-app/button/button-e2e.ts +++ b/src/e2e-app/button/button-e2e.ts @@ -1,12 +1,9 @@ import {Component} from '@angular/core'; -import {MdButton, MdAnchor} from '@angular2-material/button/button'; -import {MdIcon} from '@angular2-material/icon/icon'; @Component({ moduleId: module.id, selector: 'button-e2e', templateUrl: 'button-e2e.html', - directives: [MdButton, MdAnchor, MdIcon] }) export class ButtonE2E { isDisabled: boolean = false; diff --git a/src/e2e-app/e2e-app-module.ts b/src/e2e-app/e2e-app-module.ts new file mode 100644 index 000000000000..13a6ac2d83c7 --- /dev/null +++ b/src/e2e-app/e2e-app-module.ts @@ -0,0 +1,40 @@ +import {NgModule, ApplicationRef} from '@angular/core'; +import {BrowserModule} from '@angular/platform-browser'; +import {RouterModule} from '@angular/router'; +import {E2EApp, Home} from './e2e-app/e2e-app'; +import {IconE2E} from './icon/icon-e2e'; +import {ButtonE2E} from './button/button-e2e'; +import {MenuE2E} from './menu/menu-e2e'; +import {BasicTabs} from './tabs/tabs-e2e'; +import {E2E_APP_ROUTE_PROVIDER} from './e2e-app/routes'; +import {MaterialModule} from '@angular2-material/all/all'; + + +@NgModule({ + imports: [ + BrowserModule, + MaterialModule, + RouterModule, + ], + providers: [ + E2E_APP_ROUTE_PROVIDER, + ], + declarations: [ + E2EApp, + IconE2E, + ButtonE2E, + MenuE2E, + BasicTabs, + Home, + ], + entryComponents: [ + E2EApp, + ], +}) +export class E2eAppModule { + constructor(private _appRef: ApplicationRef) { } + + ngDoBootstrap() { + this._appRef.bootstrap(E2EApp); + } +} diff --git a/src/e2e-app/e2e-app/e2e-app.ts b/src/e2e-app/e2e-app/e2e-app.ts index 0a48fb7a85d5..95f768e69dff 100644 --- a/src/e2e-app/e2e-app/e2e-app.ts +++ b/src/e2e-app/e2e-app/e2e-app.ts @@ -1,22 +1,15 @@ import {Component} from '@angular/core'; -import {ROUTER_DIRECTIVES} from '@angular/router'; + @Component({ selector: 'home', - template: ` -

e2e website!

- ` + template: `

e2e website!

` }) export class Home {} @Component({ moduleId: module.id, selector: 'e2e-app', - providers: [], templateUrl: 'e2e-app.html', - directives: [ - ROUTER_DIRECTIVES, - ], - pipes: [] }) export class E2EApp { } diff --git a/src/e2e-app/icon/icon-e2e.ts b/src/e2e-app/icon/icon-e2e.ts index 812937a1df65..437c2d82fa54 100644 --- a/src/e2e-app/icon/icon-e2e.ts +++ b/src/e2e-app/icon/icon-e2e.ts @@ -1,10 +1,9 @@ import {Component} from '@angular/core'; -import {MD_ICON_DIRECTIVES} from '@angular2-material/icon/icon'; + @Component({ moduleId: module.id, selector: 'icon-e2e', templateUrl: 'icon-e2e.html', - directives: [MD_ICON_DIRECTIVES] }) export class IconE2E {} diff --git a/src/e2e-app/main.ts b/src/e2e-app/main.ts index c0511c96fa61..fc7c39eb9f5a 100644 --- a/src/e2e-app/main.ts +++ b/src/e2e-app/main.ts @@ -1,23 +1,5 @@ -import {bootstrap} from '@angular/platform-browser-dynamic'; -import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser'; -import {HTTP_PROVIDERS} from '@angular/http'; -import {Renderer} from '@angular/core'; -import {disableDeprecatedForms, provideForms} from '@angular/forms'; -import {MdLiveAnnouncer} from '@angular2-material/core/a11y/live-announcer'; -import {MdGestureConfig} from '@angular2-material/core/gestures/MdGestureConfig'; -import {MdIconRegistry} from '@angular2-material/icon/icon-registry'; -import {OverlayContainer} from '@angular2-material/core/overlay/overlay-container'; -import {E2EApp} from './e2e-app/e2e-app'; -import {E2E_APP_ROUTE_PROVIDER} from './e2e-app/routes'; +import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; +import {E2eAppModule} from './e2e-app-module'; -bootstrap(E2EApp, [ - E2E_APP_ROUTE_PROVIDER, - disableDeprecatedForms(), - provideForms(), - MdLiveAnnouncer, - OverlayContainer, - HTTP_PROVIDERS, - MdIconRegistry, - Renderer, - {provide: HAMMER_GESTURE_CONFIG, useClass: MdGestureConfig}, -]); + +platformBrowserDynamic().bootstrapModule(E2eAppModule); diff --git a/src/e2e-app/menu/menu-e2e.ts b/src/e2e-app/menu/menu-e2e.ts index 2e552c0f5d2d..1d6df7965509 100644 --- a/src/e2e-app/menu/menu-e2e.ts +++ b/src/e2e-app/menu/menu-e2e.ts @@ -1,11 +1,10 @@ import {Component} from '@angular/core'; -import {MD_MENU_DIRECTIVES} from '@angular2-material/menu/menu'; + @Component({ moduleId: module.id, selector: 'menu-e2e', templateUrl: 'menu-e2e.html', - directives: [MD_MENU_DIRECTIVES], styles: [` #before-t, #above-t, #combined-t { width: 60px; diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts index 8fd9e804f4f5..6d27a9970ec7 100644 --- a/src/e2e-app/system-config.ts +++ b/src/e2e-app/system-config.ts @@ -6,9 +6,11 @@ System.defaultJSExtensions = true; const components = [ + 'all', 'button', 'card', 'checkbox', + 'dialog', 'grid-list', 'icon', 'input', @@ -18,7 +20,9 @@ const components = [ 'progress-circle', 'radio', 'sidenav', + 'slider', 'slide-toggle', + 'button-toggle', 'tabs', 'toolbar', 'tooltip', diff --git a/src/e2e-app/tabs/tabs-e2e.ts b/src/e2e-app/tabs/tabs-e2e.ts index 3fa0188dedc7..45e0d25594d3 100644 --- a/src/e2e-app/tabs/tabs-e2e.ts +++ b/src/e2e-app/tabs/tabs-e2e.ts @@ -1,10 +1,8 @@ import {Component} from '@angular/core'; -import {MD_TABS_DIRECTIVES} from '@angular2-material/tabs/tabs'; @Component({ moduleId: module.id, selector: 'tabs-e2e', templateUrl: 'tabs-e2e.html', - directives: [MD_TABS_DIRECTIVES] }) export class BasicTabs {} From ecbb4f42e0473899f6ad15d8e4ed8f262ded7a99 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Fri, 5 Aug 2016 18:43:08 -0700 Subject: [PATCH 20/23] export core modules and add MdCoreModule --- src/core/core.ts | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/core/core.ts b/src/core/core.ts index 6af3af571109..e9f706865990 100644 --- a/src/core/core.ts +++ b/src/core/core.ts @@ -1,5 +1,13 @@ +import {NgModule} from '@angular/core'; +import {MdLineModule} from './line/line'; +import {RtlModule} from './rtl/dir'; +import {MdRippleModule} from './ripple/ripple'; +import {PortalModule} from './portal/portal-directives'; +import {OverlayModule} from './overlay/overlay-directives'; +import {MdLiveAnnouncer} from './a11y/live-announcer'; + // RTL -export {Dir, LayoutDirection} from './rtl/dir'; +export {Dir, LayoutDirection, RtlModule} from './rtl/dir'; // Portals export { @@ -37,16 +45,34 @@ export { export {MdGestureConfig} from './gestures/MdGestureConfig'; // Ripple -export {MD_RIPPLE_DIRECTIVES, MdRipple} from './ripple/ripple'; +export {MD_RIPPLE_DIRECTIVES, MdRipple, MdRippleModule} from './ripple/ripple'; // a11y export { AriaLivePoliteness, MdLiveAnnouncer, - LIVE_ANNOUNCER_ELEMENT_TOKEN + LIVE_ANNOUNCER_ELEMENT_TOKEN, } from './a11y/live-announcer'; export { MdUniqueSelectionDispatcher, MdUniqueSelectionDispatcherListener } from './coordination/unique-selection-dispatcher'; + +export {MdLineModule, MdLine, MdLineSetter} from './line/line'; + + +let coreModules = [ + MdLineModule, + RtlModule, + MdRippleModule, + PortalModule, + OverlayModule, +]; + +@NgModule({ + imports: coreModules, + exports: coreModules, + providers: [MdLiveAnnouncer], +}) +export class MdCoreModule { } From 02a27afd53b589e3ae791d5eb0031da51edc78be Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 8 Aug 2016 10:43:53 -0700 Subject: [PATCH 21/23] add more spacing around menu triggers --- src/e2e-app/menu/menu-e2e.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e2e-app/menu/menu-e2e.ts b/src/e2e-app/menu/menu-e2e.ts index 1d6df7965509..f5d3e5b29261 100644 --- a/src/e2e-app/menu/menu-e2e.ts +++ b/src/e2e-app/menu/menu-e2e.ts @@ -13,7 +13,7 @@ import {Component} from '@angular/core'; .bottom-row { position: absolute; - top: 100px; + top: 200px; } `] }) From e2c55f58aa5ee4c0feb20f4dc63dea047735d5f1 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 8 Aug 2016 11:16:25 -0700 Subject: [PATCH 22/23] remove TEST_COMPONENTS --- .../button-toggle/button-toggle.spec.ts | 14 ++++---- src/components/checkbox/checkbox.spec.ts | 22 ++++++------ src/components/dialog/dialog.spec.ts | 4 +-- src/components/icon/icon.spec.ts | 16 ++++----- src/components/input/input.spec.ts | 36 +++++++++---------- src/components/radio/radio.spec.ts | 12 +++---- src/components/sidenav/sidenav.spec.ts | 12 +++---- src/components/slider/slider.spec.ts | 16 ++++----- src/components/tabs/tab-group.spec.ts | 10 +++--- src/core/overlay/overlay.spec.ts | 4 +-- src/core/portal/portal.spec.ts | 5 +-- src/core/ripple/ripple.spec.ts | 4 +-- 12 files changed, 65 insertions(+), 90 deletions(-) diff --git a/src/components/button-toggle/button-toggle.spec.ts b/src/components/button-toggle/button-toggle.spec.ts index fabbbd3d1e46..16b5e1140045 100644 --- a/src/components/button-toggle/button-toggle.spec.ts +++ b/src/components/button-toggle/button-toggle.spec.ts @@ -24,7 +24,12 @@ describe('MdButtonToggle', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdButtonToggleModule, FormsModule], - declarations: TEST_COMPONENTS, + declarations: [ + ButtonTogglesInsideButtonToggleGroup, + ButtonToggleGroupWithNgModel, + ButtonTogglesInsideButtonToggleGroupMultiple, + StandaloneButtonToggle, + ], }); @@ -485,10 +490,3 @@ class ButtonTogglesInsideButtonToggleGroupMultiple { ` }) class StandaloneButtonToggle { } - -const TEST_COMPONENTS = [ - ButtonTogglesInsideButtonToggleGroup, - ButtonToggleGroupWithNgModel, - ButtonTogglesInsideButtonToggleGroupMultiple, - StandaloneButtonToggle, -]; diff --git a/src/components/checkbox/checkbox.spec.ts b/src/components/checkbox/checkbox.spec.ts index 16e6372985b5..9e1d9fa7f8f6 100644 --- a/src/components/checkbox/checkbox.spec.ts +++ b/src/components/checkbox/checkbox.spec.ts @@ -25,7 +25,16 @@ describe('MdCheckbox', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdCheckboxModule, FormsModule], - declarations: TEST_COMPONENTS, + declarations: [ + SingleCheckbox, + CheckboxWithFormDirectives, + MultipleCheckboxes, + CheckboxWithTabIndex, + CheckboxWithAriaLabel, + CheckboxWithAriaLabelledby, + CheckboxWithNameAttribute, + CheckboxWithChangeEvent, + ], }); TestBed.compileComponents(); @@ -602,14 +611,3 @@ class CheckboxWithChangeEvent { lastEvent: MdCheckboxChange; } - -const TEST_COMPONENTS = [ - SingleCheckbox, - CheckboxWithFormDirectives, - MultipleCheckboxes, - CheckboxWithTabIndex, - CheckboxWithAriaLabel, - CheckboxWithAriaLabelledby, - CheckboxWithNameAttribute, - CheckboxWithChangeEvent, -]; diff --git a/src/components/dialog/dialog.spec.ts b/src/components/dialog/dialog.spec.ts index 1cb7217c0561..810f49fe9bb8 100644 --- a/src/components/dialog/dialog.spec.ts +++ b/src/components/dialog/dialog.spec.ts @@ -32,7 +32,7 @@ describe('MdDialog', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdDialogModule], - declarations: [TEST_COMPONENTS, DirectiveWithViewContainer], + declarations: [PizzaMsg, ComponentWithChildViewContainer, DirectiveWithViewContainer], }); addProviders([ @@ -155,5 +155,3 @@ class PizzaMsg { constructor(public dialogRef: MdDialogRef) { } } - -const TEST_COMPONENTS = [PizzaMsg, ComponentWithChildViewContainer]; diff --git a/src/components/icon/icon.spec.ts b/src/components/icon/icon.spec.ts index dbcf8366a3fb..6c8c7b0638b2 100644 --- a/src/components/icon/icon.spec.ts +++ b/src/components/icon/icon.spec.ts @@ -42,7 +42,13 @@ describe('MdIcon', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdIconModule], - declarations: TEST_COMPONENTS, + declarations: [ + MdIconLigatureTestApp, + MdIconLigatureWithAriaBindingTestApp, + MdIconCustomFontCssTestApp, + MdIconFromSvgUrlTestApp, + MdIconFromSvgNameTestApp, + ], }); addProviders([ @@ -446,11 +452,3 @@ class MdIconFromSvgNameTestApp { ariaLabel: string = null; iconName = ''; } - -const TEST_COMPONENTS = [ - MdIconLigatureTestApp , - MdIconLigatureWithAriaBindingTestApp, - MdIconCustomFontCssTestApp, - MdIconFromSvgUrlTestApp, - MdIconFromSvgNameTestApp, -]; diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts index 2e35f10c0517..cef7ee77cc4c 100644 --- a/src/components/input/input.spec.ts +++ b/src/components/input/input.spec.ts @@ -16,7 +16,23 @@ describe('MdInput', function () { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdInputModule, FormsModule], - declarations: TEST_COMPONENTS, + declarations: [ + MdInputNumberTypeConservedTestComponent, + MdInputPlaceholderRequiredTestComponent, + MdInputPlaceholderElementTestComponent, + MdInputPlaceholderAttrTestComponent, + MdInputHintLabel2TestController, + MdInputHintLabelTestController, + MdInputInvalidTypeTestController, + MdInputInvalidPlaceholderTestController, + MdInputInvalidHint2TestController, + MdInputInvalidHintTestController, + MdInputBaseTestController, + MdInputAriaTestController, + MdInputWithBlurAndFocusEvents, + MdInputOptionalAttributeController, + MdInputWithNameTestController, + ], }); TestBed.compileComponents(); @@ -809,21 +825,3 @@ class MdInputOptionalAttributeController { ` }) class MdInputWithNameTestController {} - -const TEST_COMPONENTS = [ - MdInputNumberTypeConservedTestComponent, - MdInputPlaceholderRequiredTestComponent, - MdInputPlaceholderElementTestComponent, - MdInputPlaceholderAttrTestComponent, - MdInputHintLabel2TestController, - MdInputHintLabelTestController, - MdInputInvalidTypeTestController, - MdInputInvalidPlaceholderTestController, - MdInputInvalidHint2TestController, - MdInputInvalidHintTestController, - MdInputBaseTestController, - MdInputAriaTestController, - MdInputWithBlurAndFocusEvents, - MdInputOptionalAttributeController, - MdInputWithNameTestController, -]; diff --git a/src/components/radio/radio.spec.ts b/src/components/radio/radio.spec.ts index be40ceb1e749..b502d99d700a 100644 --- a/src/components/radio/radio.spec.ts +++ b/src/components/radio/radio.spec.ts @@ -23,7 +23,11 @@ describe('MdRadio', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdRadioModule, FormsModule], - declarations: TEST_COMPONENTS, + declarations: [ + RadiosInsideRadioGroup, + RadioGroupWithNgModel, + StandaloneRadioButtons, + ], }); TestBed.compileComponents(); @@ -536,9 +540,3 @@ function dispatchFocusChangeEvent(eventName: string, element: HTMLElement): void event.initEvent(eventName, true, true); element.dispatchEvent(event); } - -const TEST_COMPONENTS = [ - RadiosInsideRadioGroup, - RadioGroupWithNgModel, - StandaloneRadioButtons, -]; diff --git a/src/components/sidenav/sidenav.spec.ts b/src/components/sidenav/sidenav.spec.ts index 6ecd48965cfe..c0582530970b 100644 --- a/src/components/sidenav/sidenav.spec.ts +++ b/src/components/sidenav/sidenav.spec.ts @@ -53,7 +53,11 @@ describe('MdSidenav', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdSidenavModule], - declarations: TEST_COMPONENTS, + declarations: [ + BasicTestApp, + SidenavLayoutTwoSidenavTestApp, + SidenavLayoutNoSidenavTestApp, + ], }); TestBed.compileComponents(); @@ -359,9 +363,3 @@ class BasicTestApp { } } - -const TEST_COMPONENTS = [ - BasicTestApp, - SidenavLayoutTwoSidenavTestApp, - SidenavLayoutNoSidenavTestApp, -]; diff --git a/src/components/slider/slider.spec.ts b/src/components/slider/slider.spec.ts index ec38a6b21310..8185540f294d 100644 --- a/src/components/slider/slider.spec.ts +++ b/src/components/slider/slider.spec.ts @@ -19,7 +19,13 @@ describe('MdSlider', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdSliderModule], - declarations: TEST_COMPONENTS, + declarations: [ + StandardSlider, + DisabledSlider, + SliderWithMinAndMax, + SliderWithValue, + SliderWithStep, + ], }); addProviders([ @@ -474,14 +480,6 @@ class SliderWithValue { } }) class SliderWithStep { } -const TEST_COMPONENTS = [ - StandardSlider, - DisabledSlider, - SliderWithMinAndMax, - SliderWithValue, - SliderWithStep, -]; - /** * Dispatches a click event from an element. * Note: The mouse event truncates the position for the click. diff --git a/src/components/tabs/tab-group.spec.ts b/src/components/tabs/tab-group.spec.ts index ecb947814082..dd352545fb87 100644 --- a/src/components/tabs/tab-group.spec.ts +++ b/src/components/tabs/tab-group.spec.ts @@ -19,7 +19,10 @@ describe('MdTabGroup', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdTabsModule], - declarations: TEST_COMPONENTS, + declarations: [ + SimpleTabsTestApp, + AsyncTabsTestApp, + ], }); TestBed.compileComponents(); @@ -249,8 +252,3 @@ class AsyncTabsTestApp { }); } } - -const TEST_COMPONENTS = [ - SimpleTabsTestApp, - AsyncTabsTestApp, -]; diff --git a/src/core/overlay/overlay.spec.ts b/src/core/overlay/overlay.spec.ts index 34f864391814..852c0e441804 100644 --- a/src/core/overlay/overlay.spec.ts +++ b/src/core/overlay/overlay.spec.ts @@ -27,7 +27,7 @@ describe('Overlay', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [OverlayModule, PortalModule], - declarations: TEST_COMPONENTS, + declarations: [TestComponentWithTemplatePortals, PizzaMsg], providers: [ {provide: OverlayContainer, useFactory: () => { overlayContainerElement = document.createElement('div'); @@ -158,8 +158,6 @@ class TestComponentWithTemplatePortals { constructor(public viewContainerRef: ViewContainerRef) { } } -const TEST_COMPONENTS = [TestComponentWithTemplatePortals, PizzaMsg]; - class FakePositionStrategy implements PositionStrategy { apply(element: Element): Promise { element.classList.add('fake-positioned'); diff --git a/src/core/portal/portal.spec.ts b/src/core/portal/portal.spec.ts index 89f57df3e59b..91dbec334fc6 100644 --- a/src/core/portal/portal.spec.ts +++ b/src/core/portal/portal.spec.ts @@ -27,7 +27,7 @@ describe('Portals', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [PortalModule], - declarations: TEST_COMPONENTS, + declarations: [PortalTestApp, ArbitraryViewContainerRefComponent, PizzaMsg], }); })); @@ -448,6 +448,3 @@ class PortalTestApp { return this.portals.toArray()[2]; } } - - -const TEST_COMPONENTS = [PortalTestApp, ArbitraryViewContainerRefComponent, PizzaMsg]; diff --git a/src/core/ripple/ripple.spec.ts b/src/core/ripple/ripple.spec.ts index a755791c03be..bd1c1d3b4fa4 100644 --- a/src/core/ripple/ripple.spec.ts +++ b/src/core/ripple/ripple.spec.ts @@ -70,7 +70,7 @@ describe('MdRipple', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [MdRippleModule], - declarations: TEST_COMPONENTS, + declarations: [BasicRippleContainer, RippleContainerWithInputBindings], }); })); @@ -342,5 +342,3 @@ class RippleContainerWithInputBindings { backgroundColor = ''; @ViewChild(MdRipple) ripple: MdRipple; } - -const TEST_COMPONENTS = [BasicRippleContainer, RippleContainerWithInputBindings]; From 0808f495a76dfc2563e8974fb0209b67afe8bfb0 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Mon, 8 Aug 2016 11:18:21 -0700 Subject: [PATCH 23/23] Clean up leftovers from debugging --- src/components/all/all.ts | 4 ++-- src/components/dialog/dialog.spec.ts | 2 +- src/core/core.ts | 2 +- src/core/portal/portal.spec.ts | 4 ---- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/components/all/all.ts b/src/components/all/all.ts index 3b7598becef8..41cf8a1c41da 100644 --- a/src/components/all/all.ts +++ b/src/components/all/all.ts @@ -51,9 +51,9 @@ const MATERIAL_MODULES = [ RtlModule, ]; -@NgModule(({ +@NgModule({ imports: MATERIAL_MODULES, exports: MATERIAL_MODULES, providers: [MdLiveAnnouncer] -})) +}) export class MaterialModule { } diff --git a/src/components/dialog/dialog.spec.ts b/src/components/dialog/dialog.spec.ts index 810f49fe9bb8..1b8257b60153 100644 --- a/src/components/dialog/dialog.spec.ts +++ b/src/components/dialog/dialog.spec.ts @@ -124,7 +124,7 @@ function detectChangesForDialogOpen(fixture: ComponentFixture fixture.detectChanges(), 150); + setTimeout(() => fixture.detectChanges(), 50); } @Directive({selector: 'dir-with-view-container'}) diff --git a/src/core/core.ts b/src/core/core.ts index e9f706865990..3ba809ceb8e5 100644 --- a/src/core/core.ts +++ b/src/core/core.ts @@ -62,7 +62,7 @@ export { export {MdLineModule, MdLine, MdLineSetter} from './line/line'; -let coreModules = [ +const coreModules = [ MdLineModule, RtlModule, MdRippleModule, diff --git a/src/core/portal/portal.spec.ts b/src/core/portal/portal.spec.ts index 91dbec334fc6..0409c8c527af 100644 --- a/src/core/portal/portal.spec.ts +++ b/src/core/portal/portal.spec.ts @@ -35,10 +35,6 @@ describe('Portals', () => { builder = tcb; }))); - // beforeEach(inject([TestComponentBuilder], fakeAsync((tcb: TestComponentBuilder) => { - // builder = tcb; - // }))); - describe('PortalHostDirective', () => { it('should load a component into the portal', fakeAsync(() => { let appFixture: ComponentFixture;