cargdev/angular
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix(http): Update types for TypeScript nullability support"

Browse Source 
This reverts commit c36ec9bf60.

Broke in G3.
This commit is contained in:
Tobias Bosch
2017-04-17 09:48:11 -07:00
parent ea8ffc9841
commit 268884296a
18 changed files with 128 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/http/src/http.ts
View File

@ -8,10 +8,9 @@
import {Injectable} from '@angular/core';
import {Observable} from 'rxjs/Observable';
import {BaseRequestOptions, RequestOptions} from './base_request_options';
import {RequestMethod} from './enums';
import {ConnectionBackend, RequestArgs, RequestOptionsArgs} from './interfaces';
import {ConnectionBackend, RequestOptionsArgs} from './interfaces';
import {Request} from './static_request';
import {Response} from './static_response';
@ -20,8 +19,8 @@ function httpRequest(backend: ConnectionBackend, request: Request): Observable<R
}
function mergeOptions(
defaultOpts: BaseRequestOptions, providedOpts: RequestOptionsArgs | undefined,
method: RequestMethod, url: string): RequestArgs {
defaultOpts: BaseRequestOptions, providedOpts: RequestOptionsArgs, method: RequestMethod,
url: string): RequestOptions {
const newOptions = defaultOpts;
if (providedOpts) {
// Hack so Dart can used named parameters
@ -34,10 +33,10 @@ function mergeOptions(
body: providedOpts.body,
withCredentials: providedOpts.withCredentials,
responseType: providedOpts.responseType
})) as RequestArgs;
}));
}
return newOptions.merge(new RequestOptions({method, url})) as RequestArgs;
return newOptions.merge(new RequestOptions({method, url}));
}
/**