Skip to content

Commit 3cb0293

Browse files
committed
fix: bump to beta.6
1 parent c30d187 commit 3cb0293

File tree

12 files changed

+105
-147
lines changed

12 files changed

+105
-147
lines changed

package-lock.json

Lines changed: 53 additions & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
"node": ">= 5.4.1"
2626
},
2727
"dependencies": {
28-
"@angular/animations": "~5.0.0-beta.0",
29-
"@angular/common": "~5.0.0-beta.0",
30-
"@angular/compiler": "~5.0.0-beta.0",
31-
"@angular/core": "~5.0.0-beta.0",
32-
"@angular/forms": "~5.0.0-beta.0",
33-
"@angular/http": "~5.0.0-beta.0",
34-
"@angular/platform-browser": "~5.0.0-beta.0",
28+
"@angular/animations": "~5.0.0-beta.6",
29+
"@angular/common": "~5.0.0-beta.6",
30+
"@angular/compiler": "~5.0.0-beta.6",
31+
"@angular/core": "~5.0.0-beta.6",
32+
"@angular/forms": "~5.0.0-beta.6",
33+
"@angular/http": "~5.0.0-beta.6",
34+
"@angular/platform-browser": "~5.0.0-beta.6",
3535
"core-js": "^2.4.1",
3636
"rxjs": "^5.0.1",
3737
"systemjs": "0.19.43",
@@ -40,11 +40,11 @@
4040
"zone.js": "^0.8.12"
4141
},
4242
"devDependencies": {
43-
"@angular/compiler-cli": "~5.0.0-beta.0",
44-
"@angular/platform-browser-dynamic": "~5.0.0-beta.0",
45-
"@angular/platform-server": "~5.0.0-beta.0",
46-
"@angular/router": "~5.0.0-beta.0",
47-
"@angular/tsc-wrapped": "~5.0.0-beta.0",
43+
"@angular/compiler-cli": "~5.0.0-beta.6",
44+
"@angular/platform-browser-dynamic": "~5.0.0-beta.6",
45+
"@angular/platform-server": "~5.0.0-beta.6",
46+
"@angular/router": "~5.0.0-beta.6",
47+
"@angular/tsc-wrapped": "~5.0.0-beta.6",
4848
"@google-cloud/storage": "^1.1.1",
4949
"@types/chalk": "^0.4.31",
5050
"@types/fs-extra": "^3.0.1",

src/cdk/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
"homepage": "https://github.com/angular/material2#readme",
2525
"peerDependencies": {
26-
"@angular/core": "~5.0.0-beta.0",
27-
"@angular/common": "~5.0.0-beta.0"
26+
"@angular/core": "~5.0.0-beta.6",
27+
"@angular/common": "~5.0.0-beta.6"
2828
},
2929
"dependencies": {
3030
"tslib": "^1.7.1"

src/cdk/scrolling/scroll-dispatcher.spec.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,16 @@ describe('Scroll Dispatcher', () => {
6767
}));
6868

6969
it('should not execute the global events in the Angular zone', () => {
70-
const spy = jasmine.createSpy('zone unstable callback');
71-
const subscription = fixture.ngZone!.onUnstable.subscribe(spy);
72-
7370
scroll.scrolled(0, () => {});
7471
dispatchFakeEvent(document, 'scroll');
7572
dispatchFakeEvent(window, 'resize');
7673

77-
expect(spy).not.toHaveBeenCalled();
78-
subscription.unsubscribe();
74+
expect(fixture.ngZone!.isStable).toBe(true);
7975
});
8076

8177
it('should not execute the scrollable events in the Angular zone', () => {
82-
const spy = jasmine.createSpy('zone unstable callback');
83-
const subscription = fixture.ngZone!.onUnstable.subscribe(spy);
84-
8578
dispatchFakeEvent(fixture.componentInstance.scrollingElement.nativeElement, 'scroll');
86-
87-
expect(spy).not.toHaveBeenCalled();
88-
subscription.unsubscribe();
79+
expect(fixture.ngZone!.isStable).toBe(true);
8980
});
9081

9182
it('should be able to unsubscribe from the global scrollable', () => {

src/lib/chips/chip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
224224
selector: '[mdChipRemove], [matChipRemove]',
225225
host: {
226226
'class': 'mat-chip-remove',
227-
'(click)': '_handleClick($event)'
227+
'(click)': '_handleClick()'
228228
}
229229
})
230230
export class MdChipRemove {

src/lib/core/datetime/date-adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export abstract class DateAdapter<D> {
211211
* Checks if two dates are equal.
212212
* @param first The first date to check.
213213
* @param second The second date to check.
214-
* @returns {boolean} Whether the two dates are equal.
214+
* @returns Whether the two dates are equal.
215215
* Null dates are considered equal to other null dates.
216216
*/
217217
sameDate(first: D | null, second: D | null): boolean {

src/lib/grid-list/public_api.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88

99
import {NgModule} from '@angular/core';
1010
import {MdLineModule, MdCommonModule} from '@angular/material/core';
11+
import {MdGridList} from './grid-list';
1112
import {
12-
MdGridTile, MdGridTileText, MdGridTileFooterCssMatStyler,
13-
MdGridTileHeaderCssMatStyler, MdGridAvatarCssMatStyler
13+
MdGridTile,
14+
MdGridTileText,
15+
MdGridTileFooterCssMatStyler,
16+
MdGridTileHeaderCssMatStyler,
17+
MdGridAvatarCssMatStyler,
1418
} from './grid-tile';
15-
import {MdGridList} from './grid-list';
1619

1720

1821
@NgModule({
@@ -40,4 +43,4 @@ export class MdGridListModule {}
4043

4144

4245
export * from './grid-list';
43-
export {MdGridTile} from './grid-tile';
46+
export * from './grid-tile';

src/lib/menu/menu.spec.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,7 @@ describe('MdMenu', () => {
8585
}).not.toThrowError();
8686
});
8787

88-
<<<<<<< HEAD
8988
it('should close the menu when a click occurs outside the menu', fakeAsync(() => {
90-
=======
91-
it('should close the menu when a click occurs outside', fakeAsync(() => {
92-
>>>>>>> wip: angular 5 support
9389
const fixture = TestBed.createComponent(SimpleMenu);
9490
fixture.detectChanges();
9591
fixture.componentInstance.trigger.openMenu();

src/lib/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"homepage": "https://github.com/angular/material2#readme",
2424
"peerDependencies": {
2525
"@angular/cdk": "0.0.0-PLACEHOLDER",
26-
"@angular/core": "~5.0.0-beta.0",
27-
"@angular/common": "~5.0.0-beta.0"
26+
"@angular/core": "~5.0.0-beta.6",
27+
"@angular/common": "~5.0.0-beta.6"
2828
},
2929
"dependencies": {
3030
"tslib": "^1.7.1"

src/material-examples/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"homepage": "https://github.com/angular/material2#readme",
2525
"peerDependencies": {
2626
"@angular/cdk": "0.0.0-PLACEHOLDER",
27-
"@angular/core": "~5.0.0-beta.0",
28-
"@angular/common": "~5.0.0-beta.0",
29-
"@angular/http": "~5.0.0-beta.0",
27+
"@angular/core": "~5.0.0-beta.6",
28+
"@angular/common": "~5.0.0-beta.6",
29+
"@angular/http": "~5.0.0-beta.6",
3030
"@angular/material": "0.0.0-PLACEHOLDER"
3131
},
3232
"dependencies": {

0 commit comments

Comments
 (0)