honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: remove MapWrapper.contains().

This commit is contained in:
Martin Probst 2015-06-17 21:42:56 -07:00
parent be7ac9fd41
commit dfd30910aa
18 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/angular2/src/change_detection/parser/locals.ts
View File

@ -5,7 +5,7 @@ export class Locals {
constructor(public parent: Locals, public current: Map<any, any>) {}
contains(name: string): boolean {
if (MapWrapper.contains(this.current, name)) {
if (this.current.has(name)) {
return true;
}
@ -17,7 +17,7 @@ export class Locals {
}
get(name: string) {
if (MapWrapper.contains(this.current, name)) {
if (this.current.has(name)) {
return this.current.get(name);
}
@ -32,7 +32,7 @@ export class Locals {
// TODO(rado): consider removing this check if we can guarantee this is not
// exposed to the public API.
// TODO: vsavkin maybe it should check only the local map
if (MapWrapper.contains(this.current, name)) {
if (this.current.has(name)) {
this.current.set(name, value);
} else {
throw new BaseException(

2
modules/angular2/src/change_detection/pipes/keyvalue_changes.ts
View File

@ -105,7 +105,7 @@ export class KeyValueChanges extends Pipe {
this._removeFromSeq(lastOldSeqRecord, oldSeqRecord);
this._addToRemovals(oldSeqRecord);
}
if (MapWrapper.contains(records, key)) {
if (records.has(key)) {
newSeqRecord = records.get(key);
} else {
newSeqRecord = new KVChangeRecord(key);

6
modules/angular2/src/core/compiler/element_injector.ts
View File

@ -421,7 +421,7 @@ export class ProtoElementInjector {
var visitedIds: Map<number, boolean> = new Map();
ListWrapper.forEach(dirBindings, dirBinding => {
ListWrapper.forEach(dirBinding.resolvedHostInjectables, b => {
if (MapWrapper.contains(visitedIds, b.key.id)) {
if (visitedIds.has(b.key.id)) {
throw new BaseException(
`Multiple directives defined the same host injectable: "${stringify(b.key.token)}"`);
}
@ -730,7 +730,7 @@ export class ElementInjector extends TreeNode<ElementInjector> {
hasVariableBinding(name: string): boolean {
var vb = this._proto.directiveVariableBindings;
return isPresent(vb) && MapWrapper.contains(vb, name);
return isPresent(vb) && vb.has(name);
}
getVariableBinding(name: string): any {
@ -891,7 +891,7 @@ export class ElementInjector extends TreeNode<ElementInjector> {
private _buildAttribute(dep: DirectiveDependency): string {
var attributes = this._proto.attributes;
if (isPresent(attributes) && MapWrapper.contains(attributes, dep.attributeName)) {
if (isPresent(attributes) && attributes.has(dep.attributeName)) {
return attributes.get(dep.attributeName);
} else {
return null;

2
modules/angular2/src/core/compiler/proto_view_factory.ts
View File

@ -115,7 +115,7 @@ class BindingRecordsCreator {
directiveMetadata: renderApi.DirectiveMetadata): DirectiveRecord {
var id = boundElementIndex * 100 + directiveIndex;
if (!MapWrapper.contains(this._directiveRecordsMap, id)) {
if (!this._directiveRecordsMap.has(id)) {
this._directiveRecordsMap.set(
id, new DirectiveRecord({
directiveIndex: new DirectiveIndex(boundElementIndex, directiveIndex),

2
modules/angular2/src/core/compiler/view.ts
View File

@ -73,7 +73,7 @@ export class AppView implements ChangeDispatcher, EventDispatcher {
setLocal(contextName: string, value): void {
if (!this.hydrated()) throw new BaseException('Cannot set locals on dehydrated view.');
if (!MapWrapper.contains(this.proto.variableBindings, contextName)) {
if (!this.proto.variableBindings.has(contextName)) {
return;
}
var templateName = this.proto.variableBindings.get(contextName);

2
modules/angular2/src/core/testability/testability.ts
View File

@ -71,7 +71,7 @@ export class TestabilityRegistry {
if (elem == null) {
return null;
}
if (MapWrapper.contains(this._applications, elem)) {
if (this._applications.has(elem)) {
return this._applications.get(elem);
}
if (DOM.isShadowRoot(elem)) {

2
modules/angular2/src/di/key.ts
View File

@ -56,7 +56,7 @@ export class KeyRegistry {
}
token = theToken;
if (MapWrapper.contains(this._allKeys, token)) {
if (this._allKeys.has(token)) {
return this._allKeys.get(token);
}

1
modules/angular2/src/facade/collection.dart
View File

@ -36,7 +36,6 @@ class MapWrapper {
m[p[0]] = p[1];
return m;
});
static contains(Map m, k) => m.containsKey(k);
static forEach(Map m, fn(v, k)) {
m.forEach((k, v) => fn(v, k));
}

1
modules/angular2/src/facade/collection.ts
View File

@ -64,7 +64,6 @@ export class MapWrapper {
return result;
}
static createFromPairs(pairs: List<any>): Map<any, any> { return createMapFromPairs(pairs); }
static contains<K>(m: Map<K, any>, k: K) { return m.has(k); }
static forEach<K, V>(m: Map<K, V>, fn: /*(V, K) => void*/ Function) { m.forEach(<any>fn); }
static size(m: Map<any, any>) { return m.size; }
static delete<K>(m: Map<K, any>, k: K) { m.delete(k); }

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

@ -53,7 +53,7 @@ export class Headers {
get(header: string): string { return ListWrapper.first(this._headersMap.get(header)); }
has(header: string) { return MapWrapper.contains(this._headersMap, header); }
has(header: string) { return this._headersMap.has(header); }
keys() { return MapWrapper.keys(this._headersMap); }

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

@ -19,7 +19,7 @@ export class URLSearchParams {
paramsMap: Map<string, List<string>>;
constructor(public rawParams: string) { this.paramsMap = paramParser(rawParams); }
has(param: string): boolean { return MapWrapper.contains(this.paramsMap, param); }
has(param: string): boolean { return this.paramsMap.has(param); }
get(param: string): string { return ListWrapper.first(this.paramsMap.get(param)); }

14
modules/angular2/src/reflection/reflector.ts
View File

@ -52,7 +52,7 @@ export class Reflector {
}
parameters(typeOrFunc): List<any> {
if (MapWrapper.contains(this._typeInfo, typeOrFunc)) {
if (this._typeInfo.has(typeOrFunc)) {
return this._getTypeInfoField(typeOrFunc, "parameters", []);
} else {
return this.reflectionCapabilities.parameters(typeOrFunc);
@ -60,7 +60,7 @@ export class Reflector {
}
annotations(typeOrFunc): List<any> {
if (MapWrapper.contains(this._typeInfo, typeOrFunc)) {
if (this._typeInfo.has(typeOrFunc)) {
return this._getTypeInfoField(typeOrFunc, "annotations", []);
} else {
return this.reflectionCapabilities.annotations(typeOrFunc);
@ -68,7 +68,7 @@ export class Reflector {
}
interfaces(type): List<any> {
if (MapWrapper.contains(this._typeInfo, type)) {
if (this._typeInfo.has(type)) {
return this._getTypeInfoField(type, "interfaces", []);
} else {
return this.reflectionCapabilities.interfaces(type);
@ -76,7 +76,7 @@ export class Reflector {
}
getter(name: string): GetterFn {
if (MapWrapper.contains(this._getters, name)) {
if (this._getters.has(name)) {
return this._getters.get(name);
} else {
return this.reflectionCapabilities.getter(name);
@ -84,7 +84,7 @@ export class Reflector {
}
setter(name: string): SetterFn {
if (MapWrapper.contains(this._setters, name)) {
if (this._setters.has(name)) {
return this._setters.get(name);
} else {
return this.reflectionCapabilities.setter(name);
@ -92,7 +92,7 @@ export class Reflector {
}
method(name: string): MethodFn {
if (MapWrapper.contains(this._methods, name)) {
if (this._methods.has(name)) {
return this._methods.get(name);
} else {
return this.reflectionCapabilities.method(name);
@ -104,7 +104,7 @@ export class Reflector {
return isPresent(res) ? res : defaultValue;
}
_containsTypeInfo(typeOrFunc) { return MapWrapper.contains(this._typeInfo, typeOrFunc); }
_containsTypeInfo(typeOrFunc) { return this._typeInfo.has(typeOrFunc); }
}
function _mergeMaps(target: Map<any, any>, config: StringMap<string, Function>): void {

2
modules/angular2/src/render/dom/shadow_dom/util.ts
View File

@ -20,7 +20,7 @@ export function getComponentId(componentStringId: string) {
}
export function insertSharedStyleText(cssText, styleHost, styleEl) {
if (!MapWrapper.contains(_sharedStyleTexts, cssText)) {
if (!_sharedStyleTexts.has(cssText)) {
// Styles are unscoped and shared across components, only append them to the head
// when there are not present yet
_sharedStyleTexts.set(cssText, true);

2
modules/angular2/src/render/xhr_mock.ts
View File

@ -65,7 +65,7 @@ export class MockXHR extends XHR {
}
}
if (MapWrapper.contains(this._definitions, url)) {
if (this._definitions.has(url)) {
var response = this._definitions.get(url);
request.complete(normalizeBlank(response));
return;

2
modules/angular2/src/router/route_recognizer.ts
View File

@ -90,7 +90,7 @@ export class RouteRecognizer {
return solutions;
}
hasRoute(name: string): boolean { return MapWrapper.contains(this.names, name); }
hasRoute(name: string): boolean { return this.names.has(name); }
generate(name: string, params: any): string {
var pathRecognizer = this.names.get(name);

2
modules/angular2/src/router/route_registry.ts
View File

@ -69,7 +69,7 @@ export class RouteRegistry {
// Don't read the annotations from a type more than once –
// this prevents an infinite loop if a component routes recursively.
if (MapWrapper.contains(this._rules, component)) {
if (this._rules.has(component)) {
return;
}
var annotations = reflector.annotations(component);

4
modules/angular2/test/render/dom/compiler/pipeline_spec.ts
View File

@ -198,7 +198,7 @@ class MockStep implements CompileStep {
export class IgnoreChildrenStep implements CompileStep {
process(parent: CompileElement, current: CompileElement, control: CompileControl) {
var attributeMap = DOM.attributeMap(current.element);
if (MapWrapper.contains(attributeMap, 'ignore-children')) {
if (attributeMap.has('ignore-children')) {
current.compileChildren = false;
}
}
@ -207,7 +207,7 @@ export class IgnoreChildrenStep implements CompileStep {
class IgnoreCurrentElementStep implements CompileStep {
process(parent: CompileElement, current: CompileElement, control: CompileControl) {
var attributeMap = DOM.attributeMap(current.element);
if (MapWrapper.contains(attributeMap, 'ignore-current')) {
if (attributeMap.has('ignore-current')) {
control.ignoreCurrentElement();
}
}

4
modules/angular2/test/render/dom/events/event_manager_spec.ts
View File

@ -52,9 +52,9 @@ export function main() {
var manager = new EventManager([plugin1, plugin2], new FakeNgZone());
manager.addEventListener(element, 'click', clickHandler);
manager.addEventListener(element, 'dblclick', dblClickHandler);
expect(MapWrapper.contains(plugin1._nonBubbleEventHandlers, 'click')).toBe(false);
expect(plugin1._nonBubbleEventHandlers.has('click')).toBe(false);
expect(plugin2._nonBubbleEventHandlers.get('click')).toBe(clickHandler);
expect(MapWrapper.contains(plugin2._nonBubbleEventHandlers, 'dblclick')).toBe(false);
expect(plugin2._nonBubbleEventHandlers.has('dblclick')).toBe(false);
expect(plugin1._nonBubbleEventHandlers.get('dblclick')).toBe(dblClickHandler);
});