refactor(ListWrapper): drop filter, find, reduce & any

Closes #5152
This commit is contained in:
Victor Berchet
2015-10-09 09:07:58 -07:00
parent e667ad3e6b
commit 0dcca1a28e
30 changed files with 66 additions and 98 deletions

View File

@ -1,11 +1,11 @@
import {bootstrap} from 'angular2/bootstrap';
import {
FORM_DIRECTIVES,
ControlGroup,
NgControl,
Validators,
NgFormModel,
FormBuilder,
ControlGroup,
NgIf,
NgFor,
Component,
@ -57,7 +57,8 @@ class ShowError {
constructor(@Host() formDir: NgFormModel) { this.formDir = formDir; }
get errorMessage(): string {
var control = (<ControlGroup>this.formDir.form).find(this.controlPath);
var form: ControlGroup = this.formDir.form;
var control = form.find(this.controlPath);
if (isPresent(control) && control.touched) {
for (var i = 0; i < this.errorTypes.length; ++i) {
if (control.hasError(this.errorTypes[i])) {

View File

@ -66,7 +66,7 @@ class DataService {
}
itemsFor(order: Order): OrderItem[] {
return ListWrapper.filter(this.orderItems, i => i.orderId === order.orderId);
return this.orderItems.filter(i => i.orderId === order.orderId);
}
addItemForOrder(order: Order): void {

View File

@ -66,15 +66,14 @@ class DbService {
}
drafts(): Promise<any[]> {
return PromiseWrapper.then(this.getData(), (data) => {
return ListWrapper.filter(data,
(record => isPresent(record['draft']) && record['draft'] == true));
return PromiseWrapper.then(this.getData(), (data: any[]) => {
return data.filter(record => isPresent(record['draft']) && record['draft'] == true);
});
}
emails(): Promise<any[]> {
return PromiseWrapper.then(this.getData(), (data) => {
return ListWrapper.filter(data, (record => !isPresent(record['draft'])));
return PromiseWrapper.then(this.getData(), (data: any[]) => {
return data.filter(record => !isPresent(record['draft']));
});
}

View File

@ -1,5 +1,6 @@
import {bootstrap} from 'angular2/bootstrap';
import {
ControlGroup,
NgIf,
NgFor,
Component,
@ -11,7 +12,6 @@ import {
Provider,
FORM_DIRECTIVES,
NgControl,
ControlGroup,
Validators,
NgForm
} from 'angular2/core';
@ -81,7 +81,8 @@ class ShowError {
constructor(@Host() formDir: NgForm) { this.formDir = formDir; }
get errorMessage(): string {
var control = (<ControlGroup>this.formDir.form).find(this.controlPath);
var form: ControlGroup = this.formDir.form;
var control = form.find(this.controlPath);
if (isPresent(control) && control.touched) {
for (var i = 0; i < this.errorTypes.length; ++i) {
if (control.hasError(this.errorTypes[i])) {

View File

@ -31,7 +31,7 @@ export class Store {
remove(record: KeyModel): void { this._spliceOut(record); }
removeBy(callback: Predicate<KeyModel>): void {
var records = ListWrapper.filter(this.list, callback);
var records = this.list.filter(callback);
ListWrapper.removeAll(this.list, records);
}

View File

@ -35,7 +35,7 @@ export class Store {
remove(record: KeyModel): void { this._spliceOut(record); }
removeBy(callback: Predicate<KeyModel>): void {
var records = ListWrapper.filter(this.list, callback);
var records = this.list.filter(callback);
ListWrapper.removeAll(this.list, records);
}