honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): allow to use the `Renderer` outside of views. (#14882) 

Fixes #14872
This commit is contained in:
Tobias Bosch 2017-03-06 17:08:22 -08:00 committed by Chuck Jazdzewski
parent 6cd3326b55
commit ba4b6f58d9
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/@angular/core/src/view/services.ts
View File

@ -411,7 +411,7 @@ function callWithDebugContext(action: DebugAction, fn: any, self: any, args: any
} }
export function getCurrentDebugContext(): DebugContext { export function getCurrentDebugContext(): DebugContext {
return new DebugContext_(_currentView, _currentNodeIndex); return _currentView ? new DebugContext_(_currentView, _currentNodeIndex) : null;
} }
@ -440,23 +440,30 @@ class DebugRendererV2 implements RendererV2 {
createElement(name: string, namespace?: string): any { createElement(name: string, namespace?: string): any {
const el = this.delegate.createElement(name, namespace); const el = this.delegate.createElement(name, namespace);
const debugEl = new DebugElement(el, null, getCurrentDebugContext()); const debugCtx = getCurrentDebugContext();
debugEl.name = name; if (debugCtx) {
indexDebugNode(debugEl); const debugEl = new DebugElement(el, null, debugCtx);
debugEl.name = name;
indexDebugNode(debugEl);
}
return el; return el;
} }
createComment(value: string): any { createComment(value: string): any {
const comment = this.delegate.createComment(value); const comment = this.delegate.createComment(value);
const debugEl = new DebugNode(comment, null, getCurrentDebugContext()); const debugCtx = getCurrentDebugContext();
indexDebugNode(debugEl); if (debugCtx) {
indexDebugNode(new DebugNode(comment, null, debugCtx));
}
return comment; return comment;
} }
createText(value: string): any { createText(value: string): any {
const text = this.delegate.createText(value); const text = this.delegate.createText(value);
const debugEl = new DebugNode(text, null, getCurrentDebugContext()); const debugCtx = getCurrentDebugContext();
indexDebugNode(debugEl); if (debugCtx) {
indexDebugNode(new DebugNode(text, null, debugCtx));
}
return text; return text;
} }
@ -491,8 +498,10 @@ class DebugRendererV2 implements RendererV2 {
selectRootElement(selectorOrNode: string|any): any { selectRootElement(selectorOrNode: string|any): any {
const el = this.delegate.selectRootElement(selectorOrNode); const el = this.delegate.selectRootElement(selectorOrNode);
const debugEl = new DebugElement(el, null, getCurrentDebugContext()); const debugCtx = getCurrentDebugContext();
indexDebugNode(debugEl); if (debugCtx) {
indexDebugNode(new DebugElement(el, null, debugCtx));
}
return el; return el;
} }

15
modules/@angular/core/test/linker/regression_integration_spec.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {ANALYZE_FOR_ENTRY_COMPONENTS, Component, InjectionToken, Injector, Pipe, PipeTransform, Provider} from '@angular/core'; import {ANALYZE_FOR_ENTRY_COMPONENTS, Component, InjectionToken, Injector, Pipe, PipeTransform, Provider, RendererV2} from '@angular/core';
import {TestBed} from '@angular/core/testing'; import {TestBed} from '@angular/core/testing';
import {expect} from '@angular/platform-browser/testing/matchers'; import {expect} from '@angular/platform-browser/testing/matchers';
@ -209,6 +209,19 @@ function declareTests({useJit}: {useJit: boolean}) {
const fixture = TestBed.createComponent(MainComponent); const fixture = TestBed.createComponent(MainComponent);
expect(fixture.nativeElement).toHaveText('I was saved by my hero from a villian.'); expect(fixture.nativeElement).toHaveText('I was saved by my hero from a villian.');
}); });
it('should allow to use the renderer outside of views', () => {
@Component({template: ''})
class MyComp {
constructor(public renderer: RendererV2) {}
}
TestBed.configureTestingModule({declarations: [MyComp]});
const ctx = TestBed.createComponent(MyComp);
const txtNode = ctx.componentInstance.renderer.createText('test');
expect(txtNode).toHaveText('test');
});
}); });
} }