diff --git a/modules/angular2/src/core/compiler/pipeline/compile_pipeline.js b/modules/angular2/src/core/compiler/pipeline/compile_pipeline.js index 21f5a28628..e995be1ac7 100644 --- a/modules/angular2/src/core/compiler/pipeline/compile_pipeline.js +++ b/modules/angular2/src/core/compiler/pipeline/compile_pipeline.js @@ -1,6 +1,6 @@ import {isPresent} from 'angular2/src/facade/lang'; import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {Element, Node, DOM} from 'angular2/src/facade/dom'; +import {Element, DOM} from 'angular2/src/facade/dom'; import {CompileElement} from './compile_element'; import {CompileControl} from './compile_control'; import {CompileStep} from './compile_step'; @@ -25,12 +25,12 @@ export class CompilePipeline { var additionalChildren = this._control.internalProcess(results, 0, parent, current); if (current.compileChildren) { - var node = DOM.templateAwareRoot(current.element).firstChild; + var node = DOM.firstChild(DOM.templateAwareRoot(current.element)); while (isPresent(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) { + if (DOM.isElementNode(node)) { this._process(results, current, new CompileElement(node)); } node = nextNode; diff --git a/modules/angular2/src/core/compiler/pipeline/directive_parser.js b/modules/angular2/src/core/compiler/pipeline/directive_parser.js index 5b8c464e57..0aedf261d1 100644 --- a/modules/angular2/src/core/compiler/pipeline/directive_parser.js +++ b/modules/angular2/src/core/compiler/pipeline/directive_parser.js @@ -1,6 +1,6 @@ import {isPresent, isBlank, BaseException} from 'angular2/src/facade/lang'; import {List, MapWrapper} from 'angular2/src/facade/collection'; -import {TemplateElement} from 'angular2/src/facade/dom'; +import {DOM} from 'angular2/src/facade/dom'; import {SelectorMatcher} from '../selector'; import {CssSelector} from '../selector'; @@ -44,7 +44,7 @@ export class DirectiveParser extends CompileStep { var classList = current.classList(); var cssSelector = new CssSelector(); - cssSelector.setElement(current.element.nodeName); + cssSelector.setElement(DOM.nodeName(current.element)); for (var i=0; i < classList.length; i++) { cssSelector.addClassName(classList[i]); } @@ -66,7 +66,7 @@ export class DirectiveParser extends CompileStep { } // Note: We assume that the ViewSplitter already did its work, i.e. template directive should // only be present on