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

refactor(ivy): misc (#25174)

Browse Source 
PR Close #25174
This commit is contained in:
Victor Berchet
2018-07-29 14:35:05 -07:00
committed by Igor Minar
parent cd89eb8404
commit 36648293a8
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/src/render3/di.ts
View File

@ -11,7 +11,7 @@
import {ChangeDetectorRef as viewEngine_ChangeDetectorRef} from '../change_detection/change_detector_ref';
import {InjectionToken} from '../di/injection_token';
import {InjectFlags, Injector, inject, setCurrentInjector} from '../di/injector';
import {InjectFlags, Injector, NullInjector, inject, setCurrentInjector} from '../di/injector';
import * as viewEngine from '../linker';
import {Type} from '../type';
@ -636,20 +636,23 @@ class NodeInjector implements Injector {
class ViewContainerRef implements viewEngine.ViewContainerRef {
private _viewRefs: viewEngine.ViewRef[] = [];
constructor(
private _lContainerNode: LContainerNode, private _hostNode: LElementNode|LContainerNode) {}
get element(): ElementRef { return new ElementRef(this._hostNode.native); }
get element(): ElementRef {
const injector = getOrCreateNodeInjectorForNode(this._hostNode);
return getOrCreateElementRef(injector);
}
get injector(): Injector {
return new NodeInjector(getOrCreateNodeInjectorForNode(this._hostNode));
const injector = getOrCreateNodeInjectorForNode(this._hostNode);
return new NodeInjector(injector);
}
/** @deprecated No replacement */
get parentInjector(): Injector {
const parentLInjector = getParentLNode(this._hostNode).nodeInjector;
return parentLInjector ? new NodeInjector(parentLInjector) : Injector.NULL;
return parentLInjector ? new NodeInjector(parentLInjector) : new NullInjector();
}
clear(): void {

2
packages/core/src/render3/instructions.ts
View File

@ -336,7 +336,7 @@ export function createLViewData<T>(
null, // directives
null, // cleanupInstances
context, // context
viewData && viewData[INJECTOR] || null, // injector
viewData ? viewData[INJECTOR] : null, // injector
renderer, // renderer
sanitizer || null, // sanitizer
null, // tail