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

refactor(ListWrapper): drop forEach and removeLast

Browse Source 
Closes #4584
This commit is contained in:
Victor Berchet
2015-10-07 09:09:43 -07:00
parent 4ed642f921
commit aee176115b
35 changed files with 71 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/core/change_detection/parser/ast.ts
View File

@ -221,7 +221,7 @@ export class RecursiveAstVisitor implements AstVisitor {
return this.visitAll(ast.args);
}
visitAll(asts: AST[]): any {
ListWrapper.forEach(asts, (ast) => { ast.visit(this); });
asts.forEach(ast => ast.visit(this));
return null;
}
}

3
modules/angular2/src/core/compiler/selector.ts
View File

@ -139,8 +139,7 @@ export class CssSelector {
res += ']';
}
}
ListWrapper.forEach(this.notSelectors,
(notSelector) => { res += ":not(" + notSelector.toString() + ")"; });
this.notSelectors.forEach(notSelector => res += `:not(${notSelector})`);
return res;
}
}

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

@ -213,7 +213,7 @@ function _removeDotSegments(path: string): string {
var trailingSlash = path[path.length - 1] === '/' ? '/' : '';
var segments = path.split('/');
var out = [];
var out: string[] = [];
var up = 0;
for (var pos = 0; pos < segments.length; pos++) {
var segment = segments[pos];
@ -223,7 +223,7 @@ function _removeDotSegments(path: string): string {
break;
case '..':
if (out.length > 0) {
ListWrapper.removeAt(out, out.length - 1);
out.pop();
} else {
up++;
}
@ -235,7 +235,7 @@ function _removeDotSegments(path: string): string {
if (leadingSlash == '') {
while (up-- > 0) {
ListWrapper.insert(out, 0, '..');
out.unshift('..');
}
if (out.length === 0) out.push('.');

3
modules/angular2/src/core/compiler/xhr_mock.ts
View File

@ -28,8 +28,7 @@ export class MockXHR extends XHR {
}
do {
var request = ListWrapper.removeAt(this._requests, 0);
this._processRequest(request);
this._processRequest(this._requests.shift());
} while (this._requests.length > 0);
this.verifyNoOustandingExpectations();

15
modules/angular2/src/core/debug/debug_element.ts
View File

@ -126,9 +126,8 @@ export class DebugElement {
var views = view.viewContainers[view.elementOffset + i];
if (isPresent(views)) {
ListWrapper.forEach(views.views, (nextView) => {
els = els.concat(this._getChildElements(nextView, null));
});
views.views.forEach(
(nextView) => { els = els.concat(this._getChildElements(nextView, null)); });
}
}
}
@ -155,17 +154,15 @@ export class Scope {
var scope = [];
scope.push(debugElement);
ListWrapper.forEach(debugElement.children,
(child) => { scope = scope.concat(Scope.all(child)); });
debugElement.children.forEach(child => scope = scope.concat(Scope.all(child)));
ListWrapper.forEach(debugElement.componentViewChildren,
(child) => { scope = scope.concat(Scope.all(child)); });
debugElement.componentViewChildren.forEach(child => scope = scope.concat(Scope.all(child)));
return scope;
}
static light(debugElement: DebugElement): DebugElement[] {
var scope = [];
ListWrapper.forEach(debugElement.children, (child) => {
debugElement.children.forEach(child => {
scope.push(child);
scope = scope.concat(Scope.light(child));
});
@ -175,7 +172,7 @@ export class Scope {
static view(debugElement: DebugElement): DebugElement[] {
var scope = [];
ListWrapper.forEach(debugElement.componentViewChildren, (child) => {
debugElement.componentViewChildren.forEach(child => {
scope.push(child);
scope = scope.concat(Scope.light(child));
});

4
modules/angular2/src/core/di/binding.ts
View File

@ -498,10 +498,10 @@ function _createListOfBindings(flattenedBindings: Map<number, any>): any[] {
return MapWrapper.values(flattenedBindings);
}
function _normalizeBindings(bindings: Array<Type | Binding | any[]>,
function _normalizeBindings(bindings: Array<Type | Binding | BindingBuilder | any[]>,
res: Map<number, _NormalizedBinding | _NormalizedBinding[]>):
Map<number, _NormalizedBinding | _NormalizedBinding[]> {
ListWrapper.forEach(bindings, (b) => {
bindings.forEach(b => {
if (b instanceof Type) {
_normalizeBinding(bind(b).toClass(b), res);

11
modules/angular2/src/core/directives/ng_class.ts
View File

@ -9,11 +9,7 @@ import {
KeyValueDiffers
} from 'angular2/src/core/change_detection';
import {Renderer} from 'angular2/src/core/render';
import {
ListWrapper,
StringMapWrapper,
isListLikeIterable
} from 'angular2/src/core/facade/collection';
import {StringMapWrapper, isListLikeIterable} from 'angular2/src/core/facade/collection';
/**
* Adds and removes CSS classes based on an {expression} value.
@ -109,14 +105,13 @@ export class NgClass implements DoCheck, OnDestroy {
}
private _applyInitialClasses(isCleanup: boolean) {
ListWrapper.forEach(this._initialClasses,
(className) => { this._toggleClass(className, !isCleanup); });
this._initialClasses.forEach(className => this._toggleClass(className, !isCleanup));
}
private _applyClasses(rawClassVal, isCleanup: boolean) {
if (isPresent(rawClassVal)) {
if (isListLikeIterable(rawClassVal)) {
ListWrapper.forEach(rawClassVal, (className) => this._toggleClass(className, !isCleanup));
(<string[]>rawClassVal).forEach(className => this._toggleClass(className, !isCleanup));
} else {
StringMapWrapper.forEach(rawClassVal, (expVal, className) => {
if (expVal) this._toggleClass(className, !isCleanup);

4
modules/angular2/src/core/dom/browser_adapter.ts
View File

@ -165,9 +165,7 @@ export class BrowserDomAdapter extends GenericBrowserDomAdapter {
return node;
}
insertBefore(el, node) { el.parentNode.insertBefore(node, el); }
insertAllBefore(el, nodes) {
ListWrapper.forEach(nodes, (n) => { el.parentNode.insertBefore(n, el); });
}
insertAllBefore(el, nodes) { nodes.forEach(n => el.parentNode.insertBefore(n, el)); }
insertAfter(el, node) { el.parentNode.insertBefore(node, el.nextSibling); }
setInnerHTML(el, value) { el.innerHTML = value; }
getText(el): string { return el.textContent; }

4
modules/angular2/src/core/dom/parse5_adapter.ts
View File

@ -222,9 +222,7 @@ export class Parse5DomAdapter extends DomAdapter {
this.remove(node);
treeAdapter.insertBefore(el.parent, node, el);
}
insertAllBefore(el, nodes) {
ListWrapper.forEach(nodes, (n) => { this.insertBefore(el, n); });
}
insertAllBefore(el, nodes) { nodes.forEach(n => this.insertBefore(el, n)); }
insertAfter(el, node) {
if (el.nextSibling) {
this.insertBefore(el.nextSibling, node);

4
modules/angular2/src/core/facade/collection.dart
View File

@ -125,9 +125,6 @@ class ListWrapper {
static find(List list, bool fn(item)) =>
list.firstWhere(fn, orElse: () => null);
static bool any(List list, bool fn(item)) => list.any(fn);
static void forEach(Iterable list, fn(item)) {
list.forEach(fn);
}
static void forEachWithIndex(List list, fn(item, index)) {
for (var i = 0; i < list.length; ++i) {
@ -160,7 +157,6 @@ class ListWrapper {
}
}
static removeLast(List list) => list.removeLast();
static bool remove(List list, item) => list.remove(item);
static void clear(List l) {
l.clear();

6
modules/angular2/src/core/facade/collection.ts
View File

@ -177,11 +177,6 @@ export class ListWrapper {
static createFixedSize(size: number): any[] { return new Array(size); }
static createGrowableSize(size: number): any[] { return new Array(size); }
static clone<T>(array: T[]): T[] { return array.slice(0); }
static forEach<T>(array: T[], fn: (T) => void) {
for (var i = 0; i < array.length; i++) {
fn(array[i]);
}
}
static forEachWithIndex<T>(array: T[], fn: (T, number) => void) {
for (var i = 0; i < array.length; i++) {
fn(array[i], i);
@ -234,7 +229,6 @@ export class ListWrapper {
list.splice(index, 1);
}
}
static removeLast<T>(list: T[]): T { return list.pop(); }
static remove<T>(list: T[], el: T): boolean {
var index = list.indexOf(el);
if (index > -1) {

2
modules/angular2/src/core/forms/directives/ng_form.ts
View File

@ -158,7 +158,7 @@ export class NgForm extends ControlContainer implements Form {
}
_findContainer(path: string[]): ControlGroup {
ListWrapper.removeLast(path);
path.pop();
return ListWrapper.isEmpty(path) ? this.form : <ControlGroup>this.form.find(path);
}

2
modules/angular2/src/core/forms/directives/ng_form_model.ts
View File

@ -141,7 +141,7 @@ export class NgFormModel extends ControlContainer implements Form,
}
_updateDomValue() {
ListWrapper.forEach(this.directives, dir => {
this.directives.forEach(dir => {
var ctrl: any = this.form.find(dir.path);
dir.valueAccessor.writeValue(ctrl.value);
});

4
modules/angular2/src/core/linker/view_pool.ts
View File

@ -1,6 +1,6 @@
import {Inject, Injectable, OpaqueToken} from 'angular2/src/core/di';
import {ListWrapper, MapWrapper, Map} from 'angular2/src/core/facade/collection';
import {MapWrapper, Map} from 'angular2/src/core/facade/collection';
import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang';
import * as viewModule from './view';
@ -19,7 +19,7 @@ export class AppViewPool {
getView(protoView: viewModule.AppProtoView): viewModule.AppView {
var pooledViews = this._pooledViewsPerProtoView.get(protoView);
if (isPresent(pooledViews) && pooledViews.length > 0) {
return ListWrapper.removeLast(pooledViews);
return pooledViews.pop();
}
return null;
}

10
modules/angular2/src/core/render/dom/events/key_events.ts
View File

@ -39,19 +39,19 @@ export class KeyEventsPlugin extends EventManagerPlugin {
}
static parseEventName(eventName: string): {[key: string]: string} {
var parts = eventName.toLowerCase().split('.');
var parts: string[] = eventName.toLowerCase().split('.');
var domEventName = ListWrapper.removeAt(parts, 0);
var domEventName = parts.shift();
if ((parts.length === 0) ||
!(StringWrapper.equals(domEventName, 'keydown') ||
StringWrapper.equals(domEventName, 'keyup'))) {
return null;
}
var key = KeyEventsPlugin._normalizeKey(ListWrapper.removeLast(parts));
var key = KeyEventsPlugin._normalizeKey(parts.pop());
var fullKey = '';
ListWrapper.forEach(modifierKeys, (modifierName) => {
modifierKeys.forEach(modifierName => {
if (ListWrapper.contains(parts, modifierName)) {
ListWrapper.remove(parts, modifierName);
fullKey += modifierName + '.';
@ -78,7 +78,7 @@ export class KeyEventsPlugin extends EventManagerPlugin {
} else if (StringWrapper.equals(key, '.')) {
key = 'dot'; // because '.' is used as a separator in event names
}
ListWrapper.forEach(modifierKeys, (modifierName) => {
modifierKeys.forEach(modifierName => {
if (modifierName != key) {
var modifierGetter = StringMapWrapper.get(modifierKeyGetters, modifierName);
if (modifierGetter(event)) {