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

2
packages/core/src/core_private_export.ts
View File

@ -25,5 +25,5 @@ export {GetterFn as ɵGetterFn, MethodFn as ɵMethodFn, SetterFn as ɵSetterFn}
export {DirectRenderer as ɵDirectRenderer, RenderDebugInfo as ɵRenderDebugInfo} from './render/api';
export {global as ɵglobal, looseIdentical as ɵlooseIdentical, stringify as ɵstringify} from './util';
export {makeDecorator as ɵmakeDecorator} from './util/decorators';
export {isObservable as ɵisObservable, isPromise as ɵisPromise, merge as ɵmerge} from './util/lang';
export {isObservable as ɵisObservable, isPromise as ɵisPromise} from './util/lang';
export {NOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR as ɵNOT_FOUND_CHECK_ONLY_ELEMENT_INJECTOR} from './view/provider';

15
packages/core/src/util/lang.ts
View File

@ -24,18 +24,3 @@ export function isObservable(obj: any | Observable<any>): obj is Observable<any>
// TODO use Symbol.observable when https://github.com/ReactiveX/rxjs/issues/2415 will be resolved
return !!obj && typeof obj.subscribe === 'function';
}
// TODO(misko): replace with Object.assign once we require ES6.
export function merge<V>(m1: {[key: string]: V}, m2: {[key: string]: V}): {[key: string]: V} {
const m: {[key: string]: V} = {};
for (const k of Object.keys(m1)) {
m[k] = m1[k];
}
for (const k of Object.keys(m2)) {
m[k] = m2[k];
}
return m;
}

4
packages/core/testing/src/testing_internal.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/
import {ɵisPromise as isPromise, ɵmerge as merge} from '@angular/core';
import {ɵisPromise as isPromise} from '@angular/core';
import {global} from '@angular/core/src/util';
import {AsyncTestCompleter} from './async_test_completer';
@ -196,7 +196,7 @@ export class SpyObject {
object = new SpyObject();
}
const m = merge(config, overrides);
const m = {...config, ...overrides};
Object.keys(m).forEach(key => { object.spy(key).and.returnValue(m[key]); });
return object;
}