Skip to content

Commit 48ba798

Browse files
committed
upgrade angular2 alpah46
1 parent 0591668 commit 48ba798

File tree

13 files changed

+38
-49
lines changed

13 files changed

+38
-49
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
"homepage": "https://github.com/springboot-angular2-tutorial/angular2-app",
3131
"dependencies": {
3232
"@reactivex/rxjs": "5.0.0-alpha.7",
33-
"angular2": "2.0.0-alpha.44",
33+
"angular2": "2.0.0-alpha.46",
3434
"bootstrap": "^3.3.5",
3535
"jquery": "^2.1.4",
3636
"jwt-decode": "^1.4.0",
3737
"lodash": "^3.10.1",
3838
"md5-hex": "^1.1.0",
3939
"moment": "^2.10.6",
40-
"ng2-bootstrap": "https://github.com/akirasosa/ng2-bootstrap.git",
40+
"ng2-bootstrap": "0.46.0",
4141
"pluralize": "^1.2.1",
4242
"reflect-metadata": "0.1.2",
4343
"time-ago": "^0.1.0",

src/app/components/app/App.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@ require('!style!css!toastr/build/toastr.css');
2929
directives: [SecurityRouterOutlet, Header],
3030
})
3131
@RouteConfig([
32-
{path: '/home', as: 'Home', component: HomePage},
33-
{path: '/login', as: 'Login', component: LoginPage},
34-
{path: '/signup', as: 'Signup', component: SignupPage},
35-
{path: '/users', as: 'UserList', component: UserListPage},
36-
{path: '/users/:id', as: 'UserShow', component: UserShowPage},
37-
{path: '/users/me/edit', as: 'MeEdit', component: UserEditPage},
32+
{path: '/home', name: 'Home', component: HomePage},
33+
{path: '/login', name: 'Login', component: LoginPage},
34+
{path: '/signup', name: 'Signup', component: SignupPage},
35+
{path: '/users', name: 'UserList', component: UserListPage},
36+
{path: '/users/:id', name: 'UserShow', component: UserShowPage},
37+
{path: '/users/me/edit', name: 'MeEdit', component: UserEditPage},
3838
{
3939
path: '/users/:id/followings',
40-
as: 'FollowingList',
40+
name: 'FollowingList',
4141
component: FollowingListPage
4242
},
4343
{
4444
path: '/users/:id/followers',
45-
as: 'FollowerList',
45+
name: 'FollowerList',
4646
component: FollowerListPage
4747
},
48-
{path: '/help', as: 'Help', component: HelpPage},
49-
{path: '/', as: 'Top', component: TopPage},
48+
{path: '/help', name: 'Help', component: HelpPage},
49+
{path: '/', name: 'Top', component: TopPage},
5050
])
5151
export class App {
5252
}

src/app/components/home/Feed.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
iit,
1717
} from 'angular2/testing';
1818
import {DOM} from 'angular2/src/core/dom/dom_adapter';
19-
import {ObservableWrapper} from "angular2/src/core/facade/async";
19+
import {ObservableWrapper} from "angular2/src/facade/async";
2020
import {Router, Location, RouterOutlet} from 'angular2/router';
2121
import {ResponseOptions, Response} from 'angular2/http';
2222

src/app/components/home/Feed.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {Gravatar} from 'app/components'
2323
export class Feed {
2424

2525
feed:Micropost[];
26-
deleted:EventEmitter = new EventEmitter();
26+
deleted:EventEmitter<any> = new EventEmitter();
2727

2828
constructor(private micropostService:MicropostService,
2929
private feedService:FeedService,
@@ -44,7 +44,7 @@ export class Feed {
4444
this.micropostService.delete(id)
4545
.subscribe(() => {
4646
this.list();
47-
this.deleted.next(null);
47+
this.deleted.next({});
4848
}, e => this.errorHandler.handle(e))
4949
;
5050
}

src/app/components/micropost/MicropostList.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
import {DOM} from 'angular2/src/core/dom/dom_adapter';
1717
import {ResponseOptions, Response} from 'angular2/http';
1818
import {RouteParams} from 'angular2/router';
19-
import {ObservableWrapper} from "angular2/src/core/facade/async";
19+
import {ObservableWrapper} from "angular2/src/facade/async";
2020

2121
import {Pagination} from "ng2-bootstrap/components/pagination/pagination";
2222

src/app/components/micropost/MicropostNew.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
} from 'angular2/testing';
1616
import {DOM} from 'angular2/src/core/dom/dom_adapter';
1717
import {ResponseOptions, Response, BaseResponseOptions} from 'angular2/http';
18-
import {ObservableWrapper} from "angular2/src/core/facade/async";
18+
import {ObservableWrapper} from "angular2/src/facade/async";
1919

2020
import {MicropostNew} from 'app/components';
2121
import {APP_TEST_PROVIDERS} from "app/bindings";

src/app/components/micropost/MicropostNew.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const toastr = require('toastr');
1414
})
1515
export class MicropostNew {
1616

17-
created:EventEmitter = new EventEmitter();
17+
created:EventEmitter<any> = new EventEmitter();
1818

1919
constructor(private micropostService:MicropostService,
2020
private errorHandler:ErrorHandler) {
@@ -30,7 +30,7 @@ export class MicropostNew {
3030
.subscribe(() => {
3131
toastr.success('Micropost created!');
3232
content.value = '';
33-
this.created.next(null);
33+
this.created.next({});
3434
}, e => this.errorHandler.handle(e))
3535
;
3636
}

src/app/components/relationship/FollowBtn.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
} from 'angular2/testing';
1616
import {DOM} from 'angular2/src/core/dom/dom_adapter';
1717
import {ResponseOptions, Response, BaseResponseOptions} from 'angular2/http';
18-
import {ObservableWrapper} from "angular2/src/core/facade/async";
18+
import {ObservableWrapper} from "angular2/src/facade/async";
1919

2020
import {FollowBtn} from 'app/components';
2121
import {APP_TEST_PROVIDERS} from "app/bindings";

src/app/components/relationship/UserList.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
import {DOM} from 'angular2/src/core/dom/dom_adapter';
1717
import {ResponseOptions, Response} from 'angular2/http';
1818
import {RouteParams} from 'angular2/router';
19-
import {ObservableWrapper} from "angular2/src/core/facade/async";
19+
import {ObservableWrapper} from "angular2/src/facade/async";
2020

2121
import {Pagination} from "ng2-bootstrap/components/pagination/pagination";
2222

src/app/components/user-stats/UserStats.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
import {DOM} from 'angular2/src/core/dom/dom_adapter';
1717
import {ResponseOptions, Response} from 'angular2/http';
1818
import {RouteParams} from 'angular2/router';
19-
import {ObservableWrapper} from "angular2/src/core/facade/async";
19+
import {ObservableWrapper} from "angular2/src/facade/async";
2020

2121
import {UserStats, Gravatar} from "app/components";
2222
import {APP_TEST_PROVIDERS} from "app/bindings";

0 commit comments

Comments
 (0)