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

fix(compiler): fix nextSibling iterator in compiler. 

Due to DOM manipulations happening during compilation, it is not correct
to call nextSibling after compilation steps.
This commit is contained in:
Rado Kirov 2015-01-07 11:54:10 -08:00
parent ef20b706aa
commit a6a6273263
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/core/src/compiler/pipeline/compile_pipeline.js
View File

@ -25,11 +25,14 @@ export class CompilePipeline {
_process(results, parent:CompileElement, current:CompileElement) { _process(results, parent:CompileElement, current:CompileElement) {
var additionalChildren = this._control.internalProcess(results, 0, parent, current); var additionalChildren = this._control.internalProcess(results, 0, parent, current);
var node = DOM.templateAwareRoot(current.element).firstChild; var node = DOM.templateAwareRoot(current.element).firstChild;
while (isPresent(node)){ while (isPresent(node)) {
if(node.nodeType === Node.ELEMENT_NODE) { // compiliation can potentially move the node, so we need to store the
// next sibling before recursing.
var nextNode = DOM.nextSibling(node);
if (node.nodeType === Node.ELEMENT_NODE) {
this._process(results, current, new CompileElement(node)); this._process(results, current, new CompileElement(node));
} }
node = DOM.nextSibling(node); node = nextNode;
} }
if (isPresent(additionalChildren)) { if (isPresent(additionalChildren)) {

7
modules/core/test/compiler/pipeline/view_splitter_spec.js
View File

@ -79,6 +79,13 @@ export function main() {
expect(results[1].variableBindings).toBe(null); expect(results[1].variableBindings).toBe(null);
}); });
it('should iterate properly after a template dom modification', () => {
var rootElement = createElement('<div><div template></div><after></after></div>');
var results = createPipeline().process(rootElement);
// 1 root + 2 initial + 1 generated template elements
expect(results.length).toEqual(4);
});
}); });
}); });