fix(CompileStep): use namespace to resolve circular dep issue

This commit is contained in:
Brian Ford 2015-03-10 11:35:24 -07:00
parent 370643539f
commit e0feeaf973
1 changed files with 11 additions and 11 deletions

View File

@ -15,7 +15,7 @@ import {StyleUrlResolver} from './style_url_resolver';
import {DirectiveMetadata} from './directive_metadata'; import {DirectiveMetadata} from './directive_metadata';
import {CompileStep} from './pipeline/compile_step'; import * as NS from './pipeline/compile_step';
import {CompileElement} from './pipeline/compile_element'; import {CompileElement} from './pipeline/compile_element';
import {CompileControl} from './pipeline/compile_control'; import {CompileControl} from './pipeline/compile_control';
@ -31,7 +31,7 @@ export class ShadowDomStrategy {
* @param {string} templateUrl the template base URL * @param {string} templateUrl the template base URL
* @returns {CompileStep} a compile step to append to the compiler pipeline, null if not required. * @returns {CompileStep} a compile step to append to the compiler pipeline, null if not required.
*/ */
getStyleCompileStep(cmpMetadata: DirectiveMetadata, templateUrl: string): CompileStep { getStyleCompileStep(cmpMetadata: DirectiveMetadata, templateUrl: string): NS.CompileStep {
return null; return null;
} }
@ -43,7 +43,7 @@ export class ShadowDomStrategy {
* @param {DirectiveMetadata} cmpMetadata * @param {DirectiveMetadata} cmpMetadata
* @returns {CompileStep} a compile step to append to the compiler pipeline, null if not required. * @returns {CompileStep} a compile step to append to the compiler pipeline, null if not required.
*/ */
getTemplateCompileStep(cmpMetadata: DirectiveMetadata): CompileStep { return null; } getTemplateCompileStep(cmpMetadata: DirectiveMetadata): NS.CompileStep { return null; }
/** /**
* The application element does not go through the compiler pipeline. * The application element does not go through the compiler pipeline.
@ -91,7 +91,7 @@ export class EmulatedUnscopedShadowDomStrategy extends ShadowDomStrategy {
return [Content]; return [Content];
} }
getStyleCompileStep(cmpMetadata: DirectiveMetadata, templateUrl: string): CompileStep { getStyleCompileStep(cmpMetadata: DirectiveMetadata, templateUrl: string): NS.CompileStep {
return new _EmulatedUnscopedCssStep(cmpMetadata, templateUrl, this._styleUrlResolver, return new _EmulatedUnscopedCssStep(cmpMetadata, templateUrl, this._styleUrlResolver,
this._styleHost); this._styleHost);
} }
@ -117,12 +117,12 @@ export class EmulatedScopedShadowDomStrategy extends EmulatedUnscopedShadowDomSt
this._styleInliner = styleInliner; this._styleInliner = styleInliner;
} }
getStyleCompileStep(cmpMetadata: DirectiveMetadata, templateUrl: string): CompileStep { getStyleCompileStep(cmpMetadata: DirectiveMetadata, templateUrl: string): NS.CompileStep {
return new _EmulatedScopedCssStep(cmpMetadata, templateUrl, this._styleInliner, return new _EmulatedScopedCssStep(cmpMetadata, templateUrl, this._styleInliner,
this._styleUrlResolver, this._styleHost); this._styleUrlResolver, this._styleHost);
} }
getTemplateCompileStep(cmpMetadata: DirectiveMetadata): CompileStep { getTemplateCompileStep(cmpMetadata: DirectiveMetadata): NS.CompileStep {
return new _ShimShadowDomStep(cmpMetadata); return new _ShimShadowDomStep(cmpMetadata);
} }
@ -151,12 +151,12 @@ export class NativeShadowDomStrategy extends ShadowDomStrategy {
_moveViewNodesIntoParent(DOM.createShadowRoot(el), view); _moveViewNodesIntoParent(DOM.createShadowRoot(el), view);
} }
getStyleCompileStep(cmpMetadata: DirectiveMetadata, templateUrl: string): CompileStep { getStyleCompileStep(cmpMetadata: DirectiveMetadata, templateUrl: string): NS.CompileStep {
return new _NativeCssStep(templateUrl, this._styleUrlResolver); return new _NativeCssStep(templateUrl, this._styleUrlResolver);
} }
} }
class _ShimShadowDomStep extends CompileStep { class _ShimShadowDomStep extends NS.CompileStep {
_contentAttribute: string; _contentAttribute: string;
constructor(cmpMetadata: DirectiveMetadata) { constructor(cmpMetadata: DirectiveMetadata) {
@ -184,7 +184,7 @@ class _ShimShadowDomStep extends CompileStep {
} }
} }
class _EmulatedUnscopedCssStep extends CompileStep { class _EmulatedUnscopedCssStep extends NS.CompileStep {
_templateUrl: string; _templateUrl: string;
_styleUrlResolver: StyleUrlResolver; _styleUrlResolver: StyleUrlResolver;
_styleHost; _styleHost;
@ -213,7 +213,7 @@ class _EmulatedUnscopedCssStep extends CompileStep {
} }
} }
class _EmulatedScopedCssStep extends CompileStep { class _EmulatedScopedCssStep extends NS.CompileStep {
_templateUrl: string; _templateUrl: string;
_component: Type; _component: Type;
_styleInliner: StyleInliner; _styleInliner: StyleInliner;
@ -255,7 +255,7 @@ class _EmulatedScopedCssStep extends CompileStep {
} }
} }
class _NativeCssStep extends CompileStep { class _NativeCssStep extends NS.CompileStep {
_styleUrlResolver: StyleUrlResolver; _styleUrlResolver: StyleUrlResolver;
_templateUrl: string; _templateUrl: string;