Skip to content

Commit 02cee7b

Browse files
jelbournjelbourn
authored
chore: update to angular rc3 & newest router (#729)
1 parent 3ccb23e commit 02cee7b

File tree

12 files changed

+84
-72
lines changed

12 files changed

+84
-72
lines changed

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
"node": ">= 4.2.1 < 5"
2929
},
3030
"dependencies": {
31-
"@angular/common": "2.0.0-rc.1",
32-
"@angular/compiler": "2.0.0-rc.1",
33-
"@angular/core": "2.0.0-rc.1",
34-
"@angular/http": "2.0.0-rc.1",
35-
"@angular/platform-browser": "2.0.0-rc.1",
36-
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
37-
"@angular/router": "2.0.0-rc.1",
31+
"@angular/common": "2.0.0-rc.3",
32+
"@angular/compiler": "2.0.0-rc.3",
33+
"@angular/core": "2.0.0-rc.3",
34+
"@angular/http": "2.0.0-rc.3",
35+
"@angular/platform-browser": "2.0.0-rc.3",
36+
"@angular/platform-browser-dynamic": "2.0.0-rc.3",
37+
"@angular/router": "v3.0.0-alpha.8",
3838
"core-js": "^2.4.0",
3939
"hammerjs": "^2.0.8",
4040
"rxjs": "5.0.0-beta.6",

‎src/components/icon/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"homepage": "https://github.com/angular/material2#readme",
2323
"peerDependencies": {
24-
"@angular/http": "2.0.0-rc.1",
24+
"@angular/http": "2.0.0-rc.3",
2525
"@angular2-material/core": "2.0.0-alpha.5-2"
2626
}
2727
}

‎src/components/tabs/tabs.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,12 @@ export class MdTabGroup {
6060
private _selectedIndex: number = 0;
6161
@Input()
6262
set selectedIndex(value: number) {
63-
this._selectedIndex = value;
63+
if (value != this._selectedIndex) {
64+
this._selectedIndex = value;
6465

65-
if (this._isInitialized) {
66-
this._onSelectChange.emit(this._createChangeEvent(value));
66+
if (this._isInitialized) {
67+
this._onSelectChange.emit(this._createChangeEvent(value));
68+
}
6769
}
6870
}
6971
get selectedIndex(): number {

‎src/core/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"homepage": "https://github.com/angular/material2#readme",
2222
"peerDependencies": {
23-
"@angular/core": "^2.0.0-rc.1",
24-
"@angular/common": "^2.0.0-rc.1"
23+
"@angular/core": "^2.0.0-rc.3",
24+
"@angular/common": "^2.0.0-rc.3"
2525
}
2626
}

‎src/demo-app/demo-app/demo-app.ts‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {Route, Routes, ROUTER_DIRECTIVES} from '@angular/router';
2+
import {ROUTER_DIRECTIVES} from '@angular/router';
33

44
import {Dir} from '@angular2-material/core/rtl/dir';
55
import {MdButton} from '@angular2-material/button/button';
@@ -8,27 +8,6 @@ import {MD_LIST_DIRECTIVES} from '@angular2-material/list/list';
88
import {MdIcon} from '@angular2-material/icon/icon';
99
import {MdToolbar} from '@angular2-material/toolbar/toolbar';
1010

11-
import {CardDemo} from '../card/card-demo';
12-
import {BaselineDemo} from '../baseline/baseline-demo';
13-
import {ButtonDemo} from '../button/button-demo';
14-
import {IconDemo} from '../icon/icon-demo';
15-
import {RadioDemo} from '../radio/radio-demo';
16-
import {SidenavDemo} from '../sidenav/sidenav-demo';
17-
import {ProgressBarDemo} from '../progress-bar/progress-bar-demo';
18-
import {ProgressCircleDemo} from '../progress-circle/progress-circle-demo';
19-
import {CheckboxDemo} from '../checkbox/checkbox-demo';
20-
import {PortalDemo} from '../portal/portal-demo';
21-
import {ToolbarDemo} from '../toolbar/toolbar-demo';
22-
import {OverlayDemo} from '../overlay/overlay-demo';
23-
import {ListDemo} from '../list/list-demo';
24-
import {InputDemo} from '../input/input-demo';
25-
import {LiveAnnouncerDemo} from '../live-announcer/live-announcer-demo';
26-
import {GesturesDemo} from '../gestures/gestures-demo';
27-
import {GridListDemo} from '../grid-list/grid-list-demo';
28-
import {TabsDemo} from '../tabs/tab-group-demo';
29-
import {SlideToggleDemo} from '../slide-toggle/slide-toggle-demo';
30-
import {ButtonToggleDemo} from '../button-toggle/button-toggle-demo';
31-
3211
@Component({
3312
selector: 'home',
3413
template: `
@@ -55,28 +34,4 @@ export class Home {}
5534
],
5635
pipes: []
5736
})
58-
@Routes([
59-
new Route({path: '/', component: Home}),
60-
new Route({path: '/button', component: ButtonDemo}),
61-
new Route({path: '/card', component: CardDemo}),
62-
new Route({path: '/radio', component: RadioDemo}),
63-
new Route({path: '/sidenav', component: SidenavDemo}),
64-
new Route({path: '/slide-toggle', component: SlideToggleDemo}),
65-
new Route({path: '/progress-circle', component: ProgressCircleDemo}),
66-
new Route({path: '/progress-bar', component: ProgressBarDemo}),
67-
new Route({path: '/portal', component: PortalDemo}),
68-
new Route({path: '/overlay', component: OverlayDemo}),
69-
new Route({path: '/checkbox', component: CheckboxDemo}),
70-
new Route({path: '/input', component: InputDemo}),
71-
new Route({path: '/toolbar', component: ToolbarDemo}),
72-
new Route({path: '/icon', component: IconDemo}),
73-
new Route({path: '/list', component: ListDemo}),
74-
new Route({path: '/live-announcer', component: LiveAnnouncerDemo}),
75-
new Route({path: '/gestures', component: GesturesDemo}),
76-
new Route({path: '/grid-list', component: GridListDemo}),
77-
new Route({path: '/tabs', component: TabsDemo}),
78-
new Route({path: '/button-toggle', component: ButtonToggleDemo}),
79-
80-
new Route({path: '/baseline', component: BaselineDemo})
81-
])
8237
export class DemoApp { }

‎src/demo-app/demo-app/routes.ts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
import {provideRouter, RouterConfig} from '@angular/router';
2+
import {Home} from './demo-app';
3+
import {ButtonDemo} from '../button/button-demo';
4+
import {BaselineDemo} from '../baseline/baseline-demo';
5+
import {ButtonToggleDemo} from '../button-toggle/button-toggle-demo';
6+
import {TabsDemo} from '../tabs/tab-group-demo';
7+
import {GridListDemo} from '../grid-list/grid-list-demo';
8+
import {GesturesDemo} from '../gestures/gestures-demo';
9+
import {LiveAnnouncerDemo} from '../live-announcer/live-announcer-demo';
10+
import {ListDemo} from '../list/list-demo';
11+
import {IconDemo} from '../icon/icon-demo';
12+
import {ToolbarDemo} from '../toolbar/toolbar-demo';
13+
import {InputDemo} from '../input/input-demo';
14+
import {CheckboxDemo} from '../checkbox/checkbox-demo';
15+
import {OverlayDemo} from '../overlay/overlay-demo';
16+
import {PortalDemo} from '../portal/portal-demo';
17+
import {ProgressBarDemo} from '../progress-bar/progress-bar-demo';
18+
import {ProgressCircleDemo} from '../progress-circle/progress-circle-demo';
19+
import {SlideToggleDemo} from '../slide-toggle/slide-toggle-demo';
20+
import {SidenavDemo} from '../sidenav/sidenav-demo';
21+
import {RadioDemo} from '../radio/radio-demo';
22+
import {CardDemo} from '../card/card-demo';
23+
24+
25+
26+
export const routes: RouterConfig = [
27+
{path: '', component: Home},
28+
{path: 'button', component: ButtonDemo},
29+
{path: 'card', component: CardDemo},
30+
{path: 'radio', component: RadioDemo},
31+
{path: 'sidenav', component: SidenavDemo},
32+
{path: 'slide-toggle', component: SlideToggleDemo},
33+
{path: 'progress-circle', component: ProgressCircleDemo},
34+
{path: 'progress-bar', component: ProgressBarDemo},
35+
{path: 'portal', component: PortalDemo},
36+
{path: 'overlay', component: OverlayDemo},
37+
{path: 'checkbox', component: CheckboxDemo},
38+
{path: 'input', component: InputDemo},
39+
{path: 'toolbar', component: ToolbarDemo},
40+
{path: 'icon', component: IconDemo},
41+
{path: 'list', component: ListDemo},
42+
{path: 'live-announcer', component: LiveAnnouncerDemo},
43+
{path: 'gestures', component: GesturesDemo},
44+
{path: 'grid-list', component: GridListDemo},
45+
{path: 'tabs', component: TabsDemo},
46+
{path: 'button-toggle', component: ButtonToggleDemo},
47+
{path: 'baseline', component: BaselineDemo},
48+
];
49+
50+
export const DEMO_APP_ROUTE_PROVIDER = provideRouter(routes);

‎src/demo-app/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta charset="utf-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>Material2</title>
8-
<base href="/">
8+
<base href=".">
99

1010
{{!-- Add live-reload support, only in development. --}}
1111
{{#unless environment.production}}

‎src/demo-app/main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {bootstrap} from '@angular/platform-browser-dynamic';
22
import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
33
import {HTTP_PROVIDERS} from '@angular/http';
4-
import {ROUTER_PROVIDERS} from '@angular/router';
54
import {provide} from '@angular/core';
65
import {Renderer} from '@angular/core';
76

@@ -12,9 +11,10 @@ import {MdGestureConfig} from '@angular2-material/core/gestures/MdGestureConfig'
1211
import {MdIconRegistry} from '@angular2-material/icon/icon-registry';
1312

1413
import {DemoApp} from './demo-app/demo-app';
14+
import {DEMO_APP_ROUTE_PROVIDER} from './demo-app/routes';
1515

1616
bootstrap(DemoApp, [
17-
ROUTER_PROVIDERS,
17+
DEMO_APP_ROUTE_PROVIDER,
1818
MdLiveAnnouncer,
1919
provide(OVERLAY_CONTAINER_TOKEN, {useValue: createOverlayContainer()}),
2020
HTTP_PROVIDERS,

‎src/e2e-app/e2e-app/e2e-app.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {Route, Routes, ROUTER_DIRECTIVES} from '@angular/router';
2+
import {ROUTER_DIRECTIVES} from '@angular/router';
33

44
import {Dir} from '@angular2-material/core/rtl/dir';
55
import {MdButton} from '@angular2-material/button/button';
@@ -8,8 +8,6 @@ import {MD_LIST_DIRECTIVES} from '@angular2-material/list/list';
88
import {MdIcon} from '@angular2-material/icon/icon';
99
import {MdToolbar} from '@angular2-material/toolbar/toolbar';
1010

11-
import {ButtonE2E} from '../button/button-e2e';
12-
1311

1412
@Component({
1513
selector: 'home',
@@ -35,8 +33,4 @@ export class Home {}
3533
],
3634
pipes: []
3735
})
38-
@Routes([
39-
new Route({path: '/', component: Home}),
40-
new Route({path: '/button', component: ButtonE2E})
41-
])
4236
export class E2EApp { }

‎src/e2e-app/e2e-app/routes.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import {provideRouter, RouterConfig} from '@angular/router';
2+
import {Home} from './e2e-app';
3+
import {ButtonE2E} from '../button/button-e2e';
4+
5+
6+
export const routes: RouterConfig = [
7+
{path: '', component: Home},
8+
{path: 'button', component: ButtonE2E},
9+
];
10+
11+
export const E2E_APP_ROUTE_PROVIDER = provideRouter(routes);

0 commit comments

Comments
 (0)