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

fix(Compiler): fix text nodes after content tags

Browse Source 
fixes #2095
This commit is contained in:
Victor Berchet
2015-06-14 19:49:47 +02:00
parent b2e6ad85ea
commit d599fd3434
4 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/angular2/src/render/dom/shadow_dom/content_tag.ts
View File

@ -1,6 +1,6 @@
import * as ldModule from './light_dom';
import {DOM} from 'angular2/src/dom/dom_adapter';
import {isPresent} from 'angular2/src/facade/lang';
import {isPresent, isBlank} from 'angular2/src/facade/lang';
import {List, ListWrapper} from 'angular2/src/facade/collection';
class ContentStrategy {
@ -20,7 +20,6 @@ class RenderedContent extends ContentStrategy {
constructor(contentEl) {
super();
this.beginScript = contentEl;
this.endScript = DOM.nextSibling(this.beginScript);
this.nodes = [];
}
@ -28,15 +27,23 @@ class RenderedContent extends ContentStrategy {
// Previous content is removed.
insert(nodes: List</*node*/ any>) {
this.nodes = nodes;
if (isBlank(this.endScript)) {
// On first invocation, we need to create the end marker
this.endScript = DOM.createScriptTag('type', 'ng/contentEnd');
DOM.insertAfter(this.beginScript, this.endScript);
} else {
// On subsequent invocations, only remove all the nodes between the start end end markers
this._removeNodes();
}
DOM.insertAllBefore(this.endScript, nodes);
this._removeNodesUntil(ListWrapper.isEmpty(nodes) ? this.endScript : nodes[0]);
}
_removeNodesUntil(node) {
var p = DOM.parentElement(this.beginScript);
for (var next = DOM.nextSibling(this.beginScript); next !== node;
next = DOM.nextSibling(this.beginScript)) {
DOM.removeChild(p, next);
_removeNodes() {
for (var node = DOM.nextSibling(this.beginScript); node !== this.endScript;
node = DOM.nextSibling(this.beginScript)) {
DOM.remove(node);
}
}
}

6
modules/angular2/src/render/dom/shadow_dom/shadow_dom_compile_step.ts
View File

@ -47,13 +47,15 @@ export class ShadowDomCompileStep implements CompileStep {
var selector = MapWrapper.get(attrs, 'select');
selector = isPresent(selector) ? selector : '';
// The content tag should be replaced by a pair of marker tags (start & end).
// The end marker creation is delayed to keep the number of elements constant.
// Creating the end marker here would invalidate the parent's textNodeIndices for the subsequent
// text nodes
var contentStart = DOM.createScriptTag('type', 'ng/contentStart');
if (assertionsEnabled()) {
DOM.setAttribute(contentStart, 'select', selector);
}
var contentEnd = DOM.createScriptTag('type', 'ng/contentEnd');
DOM.insertBefore(current.element, contentStart);
DOM.insertBefore(current.element, contentEnd);
DOM.remove(current.element);
current.element = contentStart;