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

refactor: use object spread operator rather than merge (#15426)

Browse Source
This commit is contained in:
Dzmitry Shylovich
2017-03-25 00:45:33 +03:00
committed by Victor Berchet
parent 8785b2bf6d
commit c17b912eb9
6 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/forms/src/validators.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/
import {InjectionToken, ɵisObservable as isObservable, ɵisPromise as isPromise, ɵmerge as merge} from '@angular/core';
import {InjectionToken, ɵisObservable as isObservable, ɵisPromise as isPromise} from '@angular/core';
import {Observable} from 'rxjs/Observable';
import {forkJoin} from 'rxjs/observable/forkJoin';
import {fromPromise} from 'rxjs/observable/fromPromise';
@ -188,7 +188,7 @@ function _executeAsyncValidators(control: AbstractControl, validators: AsyncVali
function _mergeErrors(arrayOfErrors: ValidationErrors[]): ValidationErrors|null {
const res: {[key: string]: any} =
arrayOfErrors.reduce((res: ValidationErrors | null, errors: ValidationErrors | null) => {
return errors != null ? merge(res, errors) : res;
return errors != null ? {...res, ...errors} : res;
}, {});
return Object.keys(res).length === 0 ? null : res;
}