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

fix(core): set ViewEncapsulation.Emulated as the default again

Browse Source 
Fixes #4494
This commit is contained in:
Tobias Bosch 2015-10-05 09:49:05 -07:00
parent 6fe8b85295
commit a9aef8e5e6
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ export class CompileTemplateMetadata {
styleUrls?: string[], styleUrls?: string[],
ngContentSelectors?: string[] ngContentSelectors?: string[]
} = {}) { } = {}) {
this.encapsulation = encapsulation; this.encapsulation = isPresent(encapsulation) ? encapsulation : ViewEncapsulation.Emulated;
this.template = template; this.template = template;
this.templateUrl = templateUrl; this.templateUrl = templateUrl;
this.styles = isPresent(styles) ? styles : []; this.styles = isPresent(styles) ? styles : [];

5
modules/angular2/test/core/compiler/directive_metadata_spec.ts
View File

@ -76,6 +76,11 @@ export function main() {
}); });
describe('TemplateMetadata', () => { describe('TemplateMetadata', () => {
it('should use ViewEncapsulation.Emulated by default', () => {
expect(new CompileTemplateMetadata({encapsulation: null}).encapsulation)
.toBe(ViewEncapsulation.Emulated);
});
it('should serialize with full data', () => { it('should serialize with full data', () => {
expect(CompileTemplateMetadata.fromJson(fullTemplateMeta.toJson())) expect(CompileTemplateMetadata.fromJson(fullTemplateMeta.toJson()))
.toEqual(fullTemplateMeta); .toEqual(fullTemplateMeta);

16
modules/angular2/test/core/compiler/template_compiler_spec.ts
View File

@ -26,6 +26,7 @@ import {evalModule} from './eval_module';
import {SourceModule, moduleRef} from 'angular2/src/core/compiler/source_module'; import {SourceModule, moduleRef} from 'angular2/src/core/compiler/source_module';
import {XHR} from 'angular2/src/core/compiler/xhr'; import {XHR} from 'angular2/src/core/compiler/xhr';
import {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; import {MockXHR} from 'angular2/src/core/compiler/xhr_mock';
import {ViewEncapsulation} from 'angular2/src/core/render/api';
import {Locals} from 'angular2/src/core/change_detection/change_detection'; import {Locals} from 'angular2/src/core/change_detection/change_detection';
@ -283,22 +284,29 @@ export function main() {
moduleId: THIS_MODULE_ID, moduleId: THIS_MODULE_ID,
exportAs: 'someExportAs' exportAs: 'someExportAs'
}) })
@View({template: '<a [href]="someProp"></a>', styles: ['div {color: red}']}) @View({
template: '<a [href]="someProp"></a>',
styles: ['div {color: red}'],
encapsulation: ViewEncapsulation.None
})
class CompWithBindingsAndStyles { class CompWithBindingsAndStyles {
} }
@Component({selector: 'tree', moduleId: THIS_MODULE_ID}) @Component({selector: 'tree', moduleId: THIS_MODULE_ID})
@View({template: '<tree></tree>', directives: [TreeComp]}) @View({template: '<tree></tree>', directives: [TreeComp], encapsulation: ViewEncapsulation.None})
class TreeComp { class TreeComp {
} }
@Component({selector: 'comp-url', moduleId: THIS_MODULE_ID}) @Component({selector: 'comp-url', moduleId: THIS_MODULE_ID})
@View({templateUrl: 'compUrl.html'}) @View({templateUrl: 'compUrl.html', encapsulation: ViewEncapsulation.None})
class CompWithTemplateUrl { class CompWithTemplateUrl {
} }
@Component({selector: 'comp-tpl', moduleId: THIS_MODULE_ID}) @Component({selector: 'comp-tpl', moduleId: THIS_MODULE_ID})
@View({template: '<template><a [href]="someProp"></a></template>'}) @View({
template: '<template><a [href]="someProp"></a></template>',
encapsulation: ViewEncapsulation.None
})
class CompWithEmbeddedTemplate { class CompWithEmbeddedTemplate {
} }