refactor: remove facade/collection (#14837)

This commit is contained in:
Miško Hevery
2017-03-01 14:10:59 -08:00
committed by Chuck Jazdzewski
parent 4fe0b90948
commit b0e0839075
27 changed files with 149 additions and 244 deletions

View File

@ -6,10 +6,8 @@
* found in the LICENSE file at https://angular.io/license
*/
import {DebugElement, Type} from '@angular/core';
import {DebugElement, Predicate, Type} from '@angular/core';
import {getDOM} from '../../dom/dom_adapter';
import {Predicate} from '../../facade/collection';
import {isPresent} from '../../facade/lang';

View File

@ -7,8 +7,6 @@
*/
import * as core from '@angular/core';
import {StringMapWrapper} from '../../facade/collection';
import {getDOM} from '../dom_adapter';
const CORE_TOKENS = {
@ -40,8 +38,7 @@ export function _createNgProbe(extraTokens: NgProbeToken[], coreTokens: core.NgP
const tokens = (extraTokens || []).concat(coreTokens || []);
getDOM().setGlobalVar(INSPECT_GLOBAL_NAME, inspectNativeElement);
getDOM().setGlobalVar(
CORE_TOKENS_GLOBAL_NAME,
StringMapWrapper.merge(CORE_TOKENS, _ngProbeTokensToMap(tokens || [])));
CORE_TOKENS_GLOBAL_NAME, core.ɵmerge(CORE_TOKENS, _ngProbeTokensToMap(tokens || [])));
return () => inspectNativeElement;
}