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

Revert "feat(renderer): use a comment instead of an element when stamping out <template> elements"

Browse Source 
This reverts commit bb9cfe6f36c09716be7c100a08d56cb6f4117a59.
This commit is contained in:
vsavkin 2015-11-16 11:15:28 -08:00
parent 9985968d89
commit e274ff8a69
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/core/debug/debug_element_view_listener.ts
View File

@ -19,7 +19,7 @@ var _allViewsById = new Map<number, AppView>();
var _nextId = 0; var _nextId = 0;
function _setElementId(element, indices: number[]) { function _setElementId(element, indices: number[]) {
if (isPresent(element) && DOM.isElementNode(element)) { if (isPresent(element)) {
DOM.setData(element, NG_ID_PROPERTY, indices.join(NG_ID_SEPARATOR)); DOM.setData(element, NG_ID_PROPERTY, indices.join(NG_ID_SEPARATOR));
} }
} }

4
modules/angular2/src/core/render/dom/dom_renderer.ts
View File

@ -194,7 +194,9 @@ export abstract class DomRenderer extends Renderer implements NodeFactory<Node>
dehydrateView(viewRef: RenderViewRef) { resolveInternalDomView(viewRef).dehydrate(); } dehydrateView(viewRef: RenderViewRef) { resolveInternalDomView(viewRef).dehydrate(); }
createTemplateAnchor(attrNameAndValues: string[]): Node { return DOM.createComment('template'); } createTemplateAnchor(attrNameAndValues: string[]): Node {
return this.createElement('script', attrNameAndValues);
}
abstract createElement(name: string, attrNameAndValues: string[]): Node; abstract createElement(name: string, attrNameAndValues: string[]): Node;
abstract mergeElement(existing: Node, attrNameAndValues: string[]); abstract mergeElement(existing: Node, attrNameAndValues: string[]);
abstract createShadowRoot(host: Node, templateId: string): Node; abstract createShadowRoot(host: Node, templateId: string): Node;

13
modules/angular2/test/core/linker/integration_spec.ts
View File

@ -475,19 +475,6 @@ export function main() {
}); });
})); }));
it('should use a comment while stamping out `<template>` elements.',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
tcb.overrideView(MyComp, new ViewMetadata({template: '<template></template>'}))
.createAsync(MyComp)
.then((fixture) => {
var childNodesOfWrapper = DOM.childNodes(fixture.debugElement.nativeElement);
expect(childNodesOfWrapper.length).toBe(1);
expect(DOM.isCommentNode(childNodesOfWrapper[0])).toBe(true);
async.done();
});
}));
it('should support template directives via `template` attribute.', it('should support template directives via `template` attribute.',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => { inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
tcb.overrideView( tcb.overrideView(

2
modules/benchmarks/e2e_test/naive_infinite_scroll_spec.ts
View File

@ -9,7 +9,7 @@ describe('ng2 naive infinite scroll benchmark', function() {
it('should not throw errors', function() { it('should not throw errors', function() {
browser.get(URL); browser.get(URL);
var expectedRowCount = 18; var expectedRowCount = 18;
var expectedCellsPerRow = 27; var expectedCellsPerRow = 28;
var allScrollItems = 'scroll-app #testArea scroll-item'; var allScrollItems = 'scroll-app #testArea scroll-item';
var cells = `${ allScrollItems } .row *`; var cells = `${ allScrollItems } .row *`;
var stageButtons = `${ allScrollItems } .row stage-buttons button`; var stageButtons = `${ allScrollItems } .row stage-buttons button`;