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

refactor(Compiler): misc minor updates

Browse Source
This commit is contained in:
Victor Berchet 2015-10-23 00:17:30 -07:00
parent dd2598ccd8
commit e1e52c098b
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/angular2/src/core/compiler/template_compiler.ts
View File

@ -56,15 +56,9 @@ export class TemplateCompiler {
// For non components there is nothing to be normalized yet. // For non components there is nothing to be normalized yet.
return PromiseWrapper.resolve(directive); return PromiseWrapper.resolve(directive);
} }
var normalizedTemplatePromise;
if (directive.isComponent) { return this._templateNormalizer.normalizeTemplate(directive.type, directive.template)
normalizedTemplatePromise = .then((normalizedTemplate: CompileTemplateMetadata) => new CompileDirectiveMetadata({
this._templateNormalizer.normalizeTemplate(directive.type, directive.template);
} else {
normalizedTemplatePromise = PromiseWrapper.resolve(null);
}
return normalizedTemplatePromise.then(
(normalizedTemplate) => new CompileDirectiveMetadata({
type: directive.type, type: directive.type,
isComponent: directive.isComponent, isComponent: directive.isComponent,
dynamicLoadable: directive.dynamicLoadable, dynamicLoadable: directive.dynamicLoadable,

2
modules/angular2/src/core/compiler/template_normalizer.ts
View File

@ -59,11 +59,13 @@ export class TemplateNormalizer {
.concat(templateMeta.styleUrls.map( .concat(templateMeta.styleUrls.map(
url => this._urlResolver.resolve(directiveType.moduleUrl, url))); url => this._urlResolver.resolve(directiveType.moduleUrl, url)));
allStyleAbsUrls = ListWrapper.filter(allStyleAbsUrls, isStyleUrlResolvable); allStyleAbsUrls = ListWrapper.filter(allStyleAbsUrls, isStyleUrlResolvable);
var allResolvedStyles = allStyles.map(style => { var allResolvedStyles = allStyles.map(style => {
var styleWithImports = extractStyleUrls(this._urlResolver, templateAbsUrl, style); var styleWithImports = extractStyleUrls(this._urlResolver, templateAbsUrl, style);
styleWithImports.styleUrls.forEach(styleUrl => allStyleAbsUrls.push(styleUrl)); styleWithImports.styleUrls.forEach(styleUrl => allStyleAbsUrls.push(styleUrl));
return styleWithImports.style; return styleWithImports.style;
}); });
var encapsulation = templateMeta.encapsulation; var encapsulation = templateMeta.encapsulation;
if (encapsulation === ViewEncapsulation.Emulated && allResolvedStyles.length === 0 && if (encapsulation === ViewEncapsulation.Emulated && allResolvedStyles.length === 0 &&
allStyleAbsUrls.length === 0) { allStyleAbsUrls.length === 0) {