Skip to content

Commit 95505e6

Browse files
crisbetocrisbeto
committed
temp
1 parent fef4ce7 commit 95505e6

File tree

9 files changed

+87
-99
lines changed

9 files changed

+87
-99
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 13 additions & 13 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.4",
29+
"@angular/common": "~5.0.0-beta.4",
30+
"@angular/compiler": "~5.0.0-beta.4",
31+
"@angular/core": "~5.0.0-beta.4",
32+
"@angular/forms": "~5.0.0-beta.4",
33+
"@angular/http": "~5.0.0-beta.4",
34+
"@angular/platform-browser": "~5.0.0-beta.4",
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.4",
44+
"@angular/platform-browser-dynamic": "~5.0.0-beta.4",
45+
"@angular/platform-server": "~5.0.0-beta.4",
46+
"@angular/router": "~5.0.0-beta.4",
47+
"@angular/tsc-wrapped": "~5.0.0-beta.4",
4848
"@google-cloud/storage": "^1.1.1",
4949
"@types/chalk": "^0.4.31",
5050
"@types/fs-extra": "^3.0.1",
@@ -116,7 +116,7 @@
116116
"tsconfig-paths": "^2.2.0",
117117
"tslint": "~5.6.0",
118118
"tsutils": "^2.6.0",
119-
"typescript": "~2.2.1",
119+
"typescript": "~2.3.0",
120120
"uglify-js": "^2.8.14",
121121
"web-animations-js": "^2.2.5"
122122
}

‎src/cdk/overlay/scroll/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/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.4",
27+
"@angular/common": "~5.0.0-beta.4"
2828
},
2929
"dependencies": {
3030
"tslib": "^1.7.1"

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

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

87-
<<<<<<< HEAD
8887
it('should close the menu when a click occurs outside the menu', fakeAsync(() => {
89-
=======
90-
it('should close the menu when a click occurs outside', fakeAsync(() => {
91-
>>>>>>> wip: angular 5 support
9288
const fixture = TestBed.createComponent(SimpleMenu);
9389
fixture.detectChanges();
9490
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.4",
27+
"@angular/common": "~5.0.0-beta.4"
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.4",
28+
"@angular/common": "~5.0.0-beta.4",
29+
"@angular/http": "~5.0.0-beta.4",
3030
"@angular/material": "0.0.0-PLACEHOLDER"
3131
},
3232
"dependencies": {

‎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)