Remove Angular 2 Music Store workarounds for an fx bug that was fixed in RC2

This commit is contained in:
SteveSandersonMS
2016-04-21 12:26:18 +01:00
parent 13beb7cf27
commit c073248981
9 changed files with 12 additions and 48 deletions

View File

@@ -13,11 +13,7 @@ export class AlbumDetails {
public albumData: models.Album;
constructor(http: Http, routeParam: router.RouteParams) {
// Workaround for RC1 bug. This can be removed with ASP.NET Core 1.0 RC2.
let isServerSide = typeof window === 'undefined';
let options: any = isServerSide ? { headers: { Connection: 'keep-alive' } } : null;
http.get('/api/albums/' + routeParam.params['albumId'], options).subscribe(result => {
http.get('/api/albums/' + routeParam.params['albumId']).subscribe(result => {
this.albumData = result.json();
});
}

View File

@@ -24,14 +24,10 @@ export class AlbumEdit {
private _http: Http;
constructor(fb: FormBuilder, http: Http, routeParam: router.RouteParams) {
// Workaround for RC1 bug. This can be removed with ASP.NET Core 1.0 RC2.
let isServerSide = typeof window === 'undefined';
let options: any = isServerSide ? { headers: { Connection: 'keep-alive' } } : null;
this._http = http;
var albumId = parseInt(routeParam.params['albumId']);
http.get('/api/albums/' + albumId, options).subscribe(result => {
http.get('/api/albums/' + albumId).subscribe(result => {
var json = result.json();
this.originalAlbum = json;
(<Control>this.form.controls['Title']).updateValue(json.Title);
@@ -41,11 +37,11 @@ export class AlbumEdit {
(<Control>this.form.controls['AlbumArtUrl']).updateValue(json.AlbumArtUrl);
});
http.get('/api/artists/lookup', options).subscribe(result => {
http.get('/api/artists/lookup').subscribe(result => {
this.artists = result.json();
});
http.get('/api/genres/genre-lookup', options).subscribe(result => {
http.get('/api/genres/genre-lookup').subscribe(result => {
this.genres = result.json();
});

View File

@@ -45,12 +45,8 @@ export class AlbumsList {
}
refreshData() {
// Workaround for RC1 bug. This can be removed with ASP.NET Core 1.0 RC2.
let isServerSide = typeof window === 'undefined';
let options: any = isServerSide ? { headers: { Connection: 'keep-alive' } } : null;
var sortBy = this._sortBy + (this._sortByDesc ? ' DESC' : '');
this._http.get(`/api/albums?page=${ this._pageIndex }&pageSize=50&sortBy=${ sortBy }`, options).subscribe(result => {
this._http.get(`/api/albums?page=${ this._pageIndex }&pageSize=50&sortBy=${ sortBy }`).subscribe(result => {
var json = result.json();
this.rows = json.Data;