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

refactor(MapWrapper): drop delete(), get(), forEach() and size

Browse Source 
Closes #4618
This commit is contained in:
Victor Berchet
2015-10-08 16:01:18 -07:00
parent aab0c57aee
commit a8c34ae290
22 changed files with 51 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/http/backends/xhr_backend.ts
View File

@ -64,7 +64,7 @@ export class XHRConnection implements Connection {
};
if (isPresent(req.headers)) {
req.headers.forEach((values, name) => { _xhr.setRequestHeader(name, values.join(',')); });
req.headers.forEach((values, name) => _xhr.setRequestHeader(name, values.join(',')));
}
_xhr.addEventListener('load', onLoad);

28
modules/angular2/src/http/headers.ts
View File

@ -4,6 +4,7 @@ import {
isListLikeIterable,
Map,
MapWrapper,
StringMapWrapper,
ListWrapper,
} from 'angular2/src/core/facade/collection';
@ -36,23 +37,20 @@ import {
export class Headers {
_headersMap: Map<string, string[]>;
constructor(headers?: Headers | {[key: string]: any}) {
if (isBlank(headers)) {
this._headersMap = new Map<string, string[]>();
if (headers instanceof Headers) {
this._headersMap = (<Headers>headers)._headersMap;
return;
}
if (headers instanceof Headers) {
this._headersMap = (<Headers>headers)._headersMap;
} else /*if (headers instanceof StringMap)*/ {
this._headersMap = MapWrapper.createFromStringMap<string[]>(<{[key: string]: any}>headers);
MapWrapper.forEach(this._headersMap, (v, k) => {
if (!isListLikeIterable(v)) {
var list = [];
list.push(v);
this._headersMap.set(k, list);
}
});
this._headersMap = new Map<string, string[]>();
if (isBlank(headers)) {
return;
}
// headers instanceof StringMap
StringMapWrapper.forEach(
headers, (v, k) => { this._headersMap.set(k, isListLikeIterable(v) ? v : [v]); });
}
/**
@ -68,10 +66,10 @@ export class Headers {
/**
* Deletes all header values for the given name.
*/
delete (name: string): void { MapWrapper.delete(this._headersMap, name); }
delete (name: string): void { this._headersMap.delete(name); }
forEach(fn: (values: string[], name: string, headers: Map<string, string[]>) => void): void {
MapWrapper.forEach(this._headersMap, fn);
this._headersMap.forEach(fn);
}
/**

11
modules/angular2/src/http/url_search_params.ts
View File

@ -71,7 +71,7 @@ export class URLSearchParams {
//
// TODO(@caitp): document this better
setAll(searchParams: URLSearchParams) {
MapWrapper.forEach(searchParams.paramsMap, (value, param) => {
searchParams.paramsMap.forEach((value, param) => {
var mapParam = this.paramsMap.get(param);
var list = isPresent(mapParam) ? mapParam : [];
ListWrapper.clear(list);
@ -95,7 +95,7 @@ export class URLSearchParams {
//
// TODO(@caitp): document this better
appendAll(searchParams: URLSearchParams) {
MapWrapper.forEach(searchParams.paramsMap, (value, param) => {
searchParams.paramsMap.forEach((value, param) => {
var mapParam = this.paramsMap.get(param);
var list = isPresent(mapParam) ? mapParam : [];
for (var i = 0; i < value.length; ++i) {
@ -114,7 +114,7 @@ export class URLSearchParams {
//
// TODO(@caitp): document this better
replaceAll(searchParams: URLSearchParams) {
MapWrapper.forEach(searchParams.paramsMap, (value, param) => {
searchParams.paramsMap.forEach((value, param) => {
var mapParam = this.paramsMap.get(param);
var list = isPresent(mapParam) ? mapParam : [];
ListWrapper.clear(list);
@ -127,10 +127,9 @@ export class URLSearchParams {
toString(): string {
var paramsList = [];
MapWrapper.forEach(this.paramsMap,
(values, k) => { values.forEach(v => paramsList.push(k + '=' + v)); });
this.paramsMap.forEach((values, k) => { values.forEach(v => paramsList.push(k + '=' + v)); });
return paramsList.join('&');
}
delete (param: string): void { MapWrapper.delete(this.paramsMap, param); }
delete (param: string): void { this.paramsMap.delete(param); }
}