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

feat(ViewEncapsulation): default ViewEncapsulation to configurable

Browse Source 
BREAKING CHANGES:

DirectiveNormalizer takes new constructor arguments, `config:CompilerConfig`.

Closes #7883
This commit is contained in:
laco0416
2016-04-03 08:34:44 +09:00
committed by Misko Hevery
parent c3fafa0651
commit f93512bf27
9 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/@angular/compiler/src/directive_normalizer.ts
View File

@ -1,6 +1,6 @@
import {Injectable, ViewEncapsulation} from '@angular/core';
import {isPresent} from '../src/facade/lang';
import {isPresent, isBlank} from '../src/facade/lang';
import {BaseException} from '../src/facade/exceptions';
import {PromiseWrapper} from '../src/facade/async';
@ -24,6 +24,7 @@ import {
htmlVisitAll
} from './html_ast';
import {HtmlParser} from './html_parser';
import {CompilerConfig} from './config'
import {preparseElement, PreparsedElementType} from './template_preparser';
@ -31,7 +32,7 @@ import {preparseElement, PreparsedElementType} from './template_preparser';
@Injectable()
export class DirectiveNormalizer {
constructor(private _xhr: XHR, private _urlResolver: UrlResolver,
private _htmlParser: HtmlParser) {}
private _htmlParser: HtmlParser, private _config: CompilerConfig) {}
normalizeDirective(directive: CompileDirectiveMetadata): Promise<CompileDirectiveMetadata> {
if (!directive.isComponent) {
@ -99,6 +100,9 @@ export class DirectiveNormalizer {
});
var encapsulation = templateMeta.encapsulation;
if (isBlank(encapsulation)) {
encapsulation = this._config.defaultEncapsulation;
}
if (encapsulation === ViewEncapsulation.Emulated && allResolvedStyles.length === 0 &&
allStyleAbsUrls.length === 0) {
encapsulation = ViewEncapsulation.None;