Skip to content

Commit 37ea848

Browse files
crisbetocrisbeto
committed
fix: bump to beta.6
1 parent be77f58 commit 37ea848

File tree

9 files changed

+87
-124
lines changed

9 files changed

+87
-124
lines changed

‎package-lock.json

Lines changed: 47 additions & 71 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/scrolling/scroll-dispatcher.spec.ts

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,15 @@ 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).subscribe(() => {});
7471
dispatchFakeEvent(document, 'scroll');
7572

76-
expect(spy).not.toHaveBeenCalled();
77-
subscription.unsubscribe();
73+
expect(fixture.ngZone!.isStable).toBe(true);
7874
});
7975

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

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

‎src/lib/chips/chip.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ export class MatChip extends _MatChipMixinBase implements FocusableOption, OnDes
302302
selector: '[matChipRemove]',
303303
host: {
304304
'class': 'mat-chip-remove',
305-
'(click)': '_handleClick($event)',
306-
},
305+
'(click)': '_handleClick()',
306+
}
307307
})
308308
export class MatChipRemove {
309309
constructor(protected _parentChip: MatChip) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export abstract class DateAdapter<D> {
217217
* Checks if two dates are equal.
218218
* @param first The first date to check.
219219
* @param second The second date to check.
220-
* @returns {boolean} Whether the two dates are equal.
220+
* @returns Whether the two dates are equal.
221221
* Null dates are considered equal to other null dates.
222222
*/
223223
sameDate(first: D | null, second: D | null): boolean {

‎src/lib/grid-list/public-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88

99
export * from './grid-list-module';
1010
export * from './grid-list';
11-
export {MatGridTile} from './grid-tile';
11+
export * from './grid-tile';
1212

‎src/lib/menu/menu.spec.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,7 @@ describe('MatMenu', () => {
9090
}).not.toThrowError();
9191
});
9292

93-
<<<<<<< HEAD
9493
it('should close the menu when a click occurs outside the menu', fakeAsync(() => {
95-
=======
96-
it('should close the menu when a click occurs outside', fakeAsync(() => {
97-
>>>>>>> wip: angular 5 support
9894
const fixture = TestBed.createComponent(SimpleMenu);
9995
fixture.detectChanges();
10096
fixture.componentInstance.trigger.openMenu();

‎tools/dashboard/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@angular/animations": "~5.0.0-beta.0",
13+
"@angular/animations": "~5.0.0-beta.2",
1414
"@angular/cdk": "github:angular/cdk-builds",
15-
"@angular/common": "~5.0.0-beta.0",
16-
"@angular/compiler": "~5.0.0-beta.0",
17-
"@angular/core": "~5.0.0-beta.0",
18-
"@angular/forms": "~5.0.0-beta.0",
19-
"@angular/http": "~5.0.0-beta.0",
15+
"@angular/common": "~5.0.0-beta.2",
16+
"@angular/compiler": "~5.0.0-beta.2",
17+
"@angular/core": "~5.0.0-beta.2",
18+
"@angular/forms": "~5.0.0-beta.2",
19+
"@angular/http": "~5.0.0-beta.2",
2020
"@angular/material": "github:angular/material2-builds",
21-
"@angular/platform-browser": "~5.0.0-beta.0",
22-
"@angular/platform-browser-dynamic": "~5.0.0-beta.0",
23-
"@angular/router": "~5.0.0-beta.0",
21+
"@angular/platform-browser": "~5.0.0-beta.2",
22+
"@angular/platform-browser-dynamic": "~5.0.0-beta.2",
23+
"@angular/router": "~5.0.0-beta.2",
2424
"@swimlane/ngx-charts": "^6.0.0",
2525
"angularfire2": "^4.0.0-rc.1",
2626
"core-js": "^2.4.1",
@@ -31,8 +31,8 @@
3131
},
3232
"devDependencies": {
3333
"@angular/cli": "^1.2.0",
34-
"@angular/compiler-cli": "~5.0.0-beta.0",
35-
"@angular/language-service": "~5.0.0-beta.0",
34+
"@angular/compiler-cli": "~5.0.0-beta.2",
35+
"@angular/language-service": "~5.0.0-beta.2",
3636
"@types/jasmine": "2.5.45",
3737
"@types/node": "~6.0.60",
3838
"ts-node": "~3.0.4",

‎tools/screenshot-test/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
},
1010
"private": true,
1111
"dependencies": {
12-
"@angular/animations": "~5.0.0-beta.0",
13-
"@angular/common": "~5.0.0-beta.0",
14-
"@angular/compiler": "~5.0.0-beta.0",
15-
"@angular/compiler-cli": "~5.0.0-beta.0",
16-
"@angular/core": "~5.0.0-beta.0",
17-
"@angular/forms": "~5.0.0-beta.0",
18-
"@angular/http": "~5.0.0-beta.0",
12+
"@angular/animations": "~5.0.0-beta.2",
13+
"@angular/common": "~5.0.0-beta.2",
14+
"@angular/compiler": "~5.0.0-beta.2",
15+
"@angular/compiler-cli": "~5.0.0-beta.2",
16+
"@angular/core": "~5.0.0-beta.2",
17+
"@angular/forms": "~5.0.0-beta.2",
18+
"@angular/http": "~5.0.0-beta.2",
1919
"@angular/material": "angular/material2-builds",
20-
"@angular/platform-browser": "~5.0.0-beta.0",
21-
"@angular/platform-browser-dynamic": "~5.0.0-beta.0",
22-
"@angular/router": "~5.0.0-beta.0",
20+
"@angular/platform-browser": "~5.0.0-beta.2",
21+
"@angular/platform-browser-dynamic": "~5.0.0-beta.2",
22+
"@angular/router": "~5.0.0-beta.2",
2323
"core-js": "^2.4.1",
2424
"firebase": "^3.7.6",
2525
"rxjs": "^5.0.1",
@@ -28,7 +28,7 @@
2828
},
2929
"devDependencies": {
3030
"@angular/cli": "^1.0.0",
31-
"@angular/compiler-cli": "~5.0.0-beta.0",
31+
"@angular/compiler-cli": "~5.0.0-beta.2",
3232
"@types/node": "^6.0.42",
3333
"ts-node": "1.2.1",
3434
"typescript": "~2.2.1"

0 commit comments

Comments
 (0)