From c349bbbc08dab05ca916b20f92d1a50cb1183618 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Fri, 28 Aug 2015 21:03:19 -0700 Subject: [PATCH] refactor(ViewEncapsulation): rename to PascalCase BREAKING CHANGE - ViewEncapsulation.EMULATED => ViewEncapsulation.Emulated - ViewEncapsulation.NATIVE => ViewEncapsulation.Native - ViewEncapsulation.NONE => ViewEncapsulation.None Closes #3889 --- modules/angular2/src/core/metadata/view.ts | 4 +-- modules/angular2/src/core/render/api.ts | 8 ++--- .../src/core/render/dom/compiler/compiler.ts | 10 +++---- .../render/dom/compiler/style_encapsulator.ts | 4 +-- .../render/dom/view/proto_view_builder.ts | 2 +- .../core/render/dom/view/proto_view_merger.ts | 2 +- .../src/web_workers/shared/serializer.ts | 6 ++-- .../compiler/projection_integration_spec.ts | 2 +- .../dom/compiler/compiler_common_tests.ts | 20 ++++++------- .../core/render/dom/compiler/pipeline_spec.ts | 2 +- .../dom/compiler/style_encapsulator_spec.ts | 30 +++++++++---------- .../dom/dom_renderer_integration_spec.ts | 8 ++--- .../dom/view/proto_view_builder_spec.ts | 2 +- .../proto_view_merger_integration_spec.ts | 8 ++--- .../src/components/button/button.ts | 4 +-- .../src/components/checkbox/checkbox.ts | 2 +- .../src/components/dialog/dialog.ts | 4 +-- .../src/components/grid_list/grid_list.ts | 4 +-- .../progress-circular/progress_circular.ts | 2 +- .../progress-linear/progress_linear.ts | 2 +- .../src/components/radio/radio_button.ts | 4 +-- .../src/components/switcher/switch.ts | 2 +- modules/examples/src/material/button/index.ts | 2 +- .../examples/src/material/checkbox/index.ts | 2 +- modules/examples/src/material/dialog/index.ts | 4 +-- .../examples/src/material/grid_list/index.ts | 2 +- modules/examples/src/material/input/index.ts | 2 +- .../src/material/progress-linear/index.ts | 2 +- modules/examples/src/material/radio/index.ts | 2 +- .../examples/src/material/switcher/index.ts | 2 +- 30 files changed, 75 insertions(+), 75 deletions(-) diff --git a/modules/angular2/src/core/metadata/view.ts b/modules/angular2/src/core/metadata/view.ts index a791566872..1575046b42 100644 --- a/modules/angular2/src/core/metadata/view.ts +++ b/modules/angular2/src/core/metadata/view.ts @@ -91,9 +91,9 @@ export class ViewMetadata { /** * Specify how the template and the styles should be encapsulated. - * The default is {@link ViewEncapsulation#EMULATED `ViewEncapsulation.EMULATED`} if the view + * The default is {@link ViewEncapsulation#Emulated `ViewEncapsulation.Emulated`} if the view * has styles, - * otherwise {@link ViewEncapsulation#NONE `ViewEncapsulation.NONE`}. + * otherwise {@link ViewEncapsulation#None `ViewEncapsulation.None`}. */ encapsulation: ViewEncapsulation; diff --git a/modules/angular2/src/core/render/api.ts b/modules/angular2/src/core/render/api.ts index 148f6f990c..d92e316d35 100644 --- a/modules/angular2/src/core/render/api.ts +++ b/modules/angular2/src/core/render/api.ts @@ -293,15 +293,15 @@ export enum ViewEncapsulation { * Emulate scoping of styles by preprocessing the style rules * and adding additional attributes to elements. This is the default. */ - EMULATED, + Emulated, /** * Uses the native mechanism of the renderer. For the DOM this means creating a ShadowRoot. */ - NATIVE, + Native, /** * Don't scope the template nor the styles. */ - NONE + None } export class ViewDefinition { @@ -329,7 +329,7 @@ export class ViewDefinition { this.styleAbsUrls = styleAbsUrls; this.styles = styles; this.directives = directives; - this.encapsulation = isPresent(encapsulation) ? encapsulation : ViewEncapsulation.EMULATED; + this.encapsulation = isPresent(encapsulation) ? encapsulation : ViewEncapsulation.Emulated; } } diff --git a/modules/angular2/src/core/render/dom/compiler/compiler.ts b/modules/angular2/src/core/render/dom/compiler/compiler.ts index 04a9c20c06..03733af10c 100644 --- a/modules/angular2/src/core/render/dom/compiler/compiler.ts +++ b/modules/angular2/src/core/render/dom/compiler/compiler.ts @@ -57,7 +57,7 @@ export class DomCompiler extends RenderCompiler { styles: null, styleAbsUrls: null, directives: [directiveMetadata], - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }); let selector = CssSelector.parse(directiveMetadata.selector)[0]; @@ -75,7 +75,7 @@ export class DomCompiler extends RenderCompiler { _compileView(viewDef: ViewDefinition, templateAndStyles: TemplateAndStyles, protoViewType: ViewType): Promise { - if (viewDef.encapsulation === ViewEncapsulation.EMULATED && + if (viewDef.encapsulation === ViewEncapsulation.Emulated && templateAndStyles.styles.length === 0) { viewDef = this._normalizeViewEncapsulationIfThereAreNoStyles(viewDef); } @@ -84,7 +84,7 @@ export class DomCompiler extends RenderCompiler { var compiledStyles = pipeline.processStyles(templateAndStyles.styles); var compileElements = pipeline.processElements( this._createTemplateElm(templateAndStyles.template), protoViewType, viewDef); - if (viewDef.encapsulation === ViewEncapsulation.NATIVE) { + if (viewDef.encapsulation === ViewEncapsulation.Native) { prependAll(DOM.content(compileElements[0].element), compiledStyles.map(style => DOM.createStyleElement(style))); } else { @@ -107,14 +107,14 @@ export class DomCompiler extends RenderCompiler { } _normalizeViewEncapsulationIfThereAreNoStyles(viewDef: ViewDefinition): ViewDefinition { - if (viewDef.encapsulation === ViewEncapsulation.EMULATED) { + if (viewDef.encapsulation === ViewEncapsulation.Emulated) { return new ViewDefinition({ componentId: viewDef.componentId, templateAbsUrl: viewDef.templateAbsUrl, template: viewDef.template, styleAbsUrls: viewDef.styleAbsUrls, styles: viewDef.styles, directives: viewDef.directives, - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }); } else { return viewDef; diff --git a/modules/angular2/src/core/render/dom/compiler/style_encapsulator.ts b/modules/angular2/src/core/render/dom/compiler/style_encapsulator.ts index 806ac03766..473bbcbc07 100644 --- a/modules/angular2/src/core/render/dom/compiler/style_encapsulator.ts +++ b/modules/angular2/src/core/render/dom/compiler/style_encapsulator.ts @@ -15,7 +15,7 @@ export class StyleEncapsulator implements CompileStep { if (isElementWithTag(current.element, NG_CONTENT_ELEMENT_NAME)) { current.inheritedProtoView.bindNgContent(); } else { - if (this._view.encapsulation === ViewEncapsulation.EMULATED) { + if (this._view.encapsulation === ViewEncapsulation.Emulated) { this._processEmulatedScopedElement(current, parent); } } @@ -23,7 +23,7 @@ export class StyleEncapsulator implements CompileStep { processStyle(style: string): string { var encapsulation = this._view.encapsulation; - if (encapsulation === ViewEncapsulation.EMULATED) { + if (encapsulation === ViewEncapsulation.Emulated) { return this._shimCssForComponent(style, this._view.componentId); } else { return style; diff --git a/modules/angular2/src/core/render/dom/view/proto_view_builder.ts b/modules/angular2/src/core/render/dom/view/proto_view_builder.ts index b280705864..b0b3d519b3 100644 --- a/modules/angular2/src/core/render/dom/view/proto_view_builder.ts +++ b/modules/angular2/src/core/render/dom/view/proto_view_builder.ts @@ -189,7 +189,7 @@ export class ElementBinderBuilder { throw new BaseException('Only one nested view per element is allowed'); } this.nestedProtoView = - new ProtoViewBuilder(rootElement, ViewType.EMBEDDED, ViewEncapsulation.NONE); + new ProtoViewBuilder(rootElement, ViewType.EMBEDDED, ViewEncapsulation.None); return this.nestedProtoView; } diff --git a/modules/angular2/src/core/render/dom/view/proto_view_merger.ts b/modules/angular2/src/core/render/dom/view/proto_view_merger.ts index 90fc027b05..8ac4c41abb 100644 --- a/modules/angular2/src/core/render/dom/view/proto_view_merger.ts +++ b/modules/angular2/src/core/render/dom/view/proto_view_merger.ts @@ -193,7 +193,7 @@ function mergeComponent(hostProtoView: ClonedProtoView, binderIdx: number, // unwrap the fragment elements into arrays of nodes after projecting var fragments = extractFragmentNodesFromElements(fragmentElements); - var useNativeShadowRoot = nestedProtoView.original.encapsulation === ViewEncapsulation.NATIVE; + var useNativeShadowRoot = nestedProtoView.original.encapsulation === ViewEncapsulation.Native; if (useNativeShadowRoot) { targetElementsWithNativeShadowRoot.add(hostElement); } diff --git a/modules/angular2/src/web_workers/shared/serializer.ts b/modules/angular2/src/web_workers/shared/serializer.ts index 249fd9cbdc..b5903e4af3 100644 --- a/modules/angular2/src/web_workers/shared/serializer.ts +++ b/modules/angular2/src/web_workers/shared/serializer.ts @@ -57,9 +57,9 @@ export class Serializer { this._enumRegistry.set(ViewType, viewTypeMap); var viewEncapsulationMap = new Map(); - viewEncapsulationMap[0] = ViewEncapsulation.EMULATED; - viewEncapsulationMap[1] = ViewEncapsulation.NATIVE; - viewEncapsulationMap[2] = ViewEncapsulation.NONE; + viewEncapsulationMap[0] = ViewEncapsulation.Emulated; + viewEncapsulationMap[1] = ViewEncapsulation.Native; + viewEncapsulationMap[2] = ViewEncapsulation.None; this._enumRegistry.set(ViewEncapsulation, viewEncapsulationMap); var propertyBindingTypeMap = new Map(); diff --git a/modules/angular2/test/core/compiler/projection_integration_spec.ts b/modules/angular2/test/core/compiler/projection_integration_spec.ts index 0abf29adcf..31cc5d889e 100644 --- a/modules/angular2/test/core/compiler/projection_integration_spec.ts +++ b/modules/angular2/test/core/compiler/projection_integration_spec.ts @@ -473,7 +473,7 @@ class Simple { @View({ template: 'SIMPLE()', directives: [], - encapsulation: ViewEncapsulation.NATIVE + encapsulation: ViewEncapsulation.Native }) class SimpleNative { } diff --git a/modules/angular2/test/core/render/dom/compiler/compiler_common_tests.ts b/modules/angular2/test/core/render/dom/compiler/compiler_common_tests.ts index f84e551c7a..83b1d5de93 100644 --- a/modules/angular2/test/core/render/dom/compiler/compiler_common_tests.ts +++ b/modules/angular2/test/core/render/dom/compiler/compiler_common_tests.ts @@ -191,14 +191,14 @@ export function runCompilerCommonTests() { }); })); - it('should store the styles in the SharedStylesHost for ViewEncapsulation.NONE', + it('should store the styles in the SharedStylesHost for ViewEncapsulation.None', inject([AsyncTestCompleter], (async) => { var compiler = createCompiler(); compiler.compile(new ViewDefinition({ componentId: 'someComponent', template: '', styles: ['a {};'], - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None })) .then((protoViewDto) => { expect(DOM.getInnerHTML(templateRoot(protoViewDto))).toEqual(''); @@ -207,14 +207,14 @@ export function runCompilerCommonTests() { }); })); - it('should store the styles in the SharedStylesHost for ViewEncapsulation.EMULATED', + it('should store the styles in the SharedStylesHost for ViewEncapsulation.Emulated', inject([AsyncTestCompleter], (async) => { var compiler = createCompiler(); compiler.compile(new ViewDefinition({ componentId: 'someComponent', template: '', styles: ['a {};'], - encapsulation: ViewEncapsulation.EMULATED + encapsulation: ViewEncapsulation.Emulated })) .then((protoViewDto) => { expect(DOM.getInnerHTML(templateRoot(protoViewDto))).toEqual(''); @@ -224,14 +224,14 @@ export function runCompilerCommonTests() { })); if (DOM.supportsNativeShadowDOM()) { - it('should store the styles in the template for ViewEncapsulation.NATIVE', + it('should store the styles in the template for ViewEncapsulation.Native', inject([AsyncTestCompleter], (async) => { var compiler = createCompiler(); compiler.compile(new ViewDefinition({ componentId: 'someComponent', template: '', styles: ['a {};'], - encapsulation: ViewEncapsulation.NATIVE + encapsulation: ViewEncapsulation.Native })) .then((protoViewDto) => { expect(DOM.getInnerHTML(templateRoot(protoViewDto))) @@ -242,24 +242,24 @@ export function runCompilerCommonTests() { })); } - it('should default to ViewEncapsulation.NONE if no styles are specified', + it('should default to ViewEncapsulation.None if no styles are specified', inject([AsyncTestCompleter], (async) => { var compiler = createCompiler(); compiler.compile( new ViewDefinition({componentId: 'someComponent', template: '', styles: []})) .then((protoView) => { - expect(mockStepFactory.viewDef.encapsulation).toBe(ViewEncapsulation.NONE); + expect(mockStepFactory.viewDef.encapsulation).toBe(ViewEncapsulation.None); async.done(); }); })); - it('should default to ViewEncapsulation.EMULATED if styles are specified', + it('should default to ViewEncapsulation.Emulated if styles are specified', inject([AsyncTestCompleter], (async) => { var compiler = createCompiler(); compiler.compile(new ViewDefinition( {componentId: 'someComponent', template: '', styles: ['a {};']})) .then((protoView) => { - expect(mockStepFactory.viewDef.encapsulation).toBe(ViewEncapsulation.EMULATED); + expect(mockStepFactory.viewDef.encapsulation).toBe(ViewEncapsulation.Emulated); async.done(); }); })); diff --git a/modules/angular2/test/core/render/dom/compiler/pipeline_spec.ts b/modules/angular2/test/core/render/dom/compiler/pipeline_spec.ts index 41e75fb454..1945963ac3 100644 --- a/modules/angular2/test/core/render/dom/compiler/pipeline_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/pipeline_spec.ts @@ -53,7 +53,7 @@ export function main() { new MockStep((parent, current, control) => { if (isPresent(DOM.getAttribute(current.element, 'viewroot'))) { current.inheritedProtoView = - new ProtoViewBuilder(current.element, ViewType.EMBEDDED, ViewEncapsulation.NONE); + new ProtoViewBuilder(current.element, ViewType.EMBEDDED, ViewEncapsulation.None); } }) ]); diff --git a/modules/angular2/test/core/render/dom/compiler/style_encapsulator_spec.ts b/modules/angular2/test/core/render/dom/compiler/style_encapsulator_spec.ts index 0c7c9719b6..aa5c7af39d 100644 --- a/modules/angular2/test/core/render/dom/compiler/style_encapsulator_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/style_encapsulator_spec.ts @@ -62,38 +62,38 @@ export function main() { return compileElements[0].inheritedProtoView; } - describe('ViewEncapsulation.NONE', () => { + describe('ViewEncapsulation.None', () => { it('should not change the styles', () => { - var cs = processStyles(ViewEncapsulation.NONE, 'someComponent', ['.one {}']); + var cs = processStyles(ViewEncapsulation.None, 'someComponent', ['.one {}']); expect(cs[0]).toEqual('.one {}'); }); }); - describe('ViewEncapsulation.NATIVE', () => { + describe('ViewEncapsulation.Native', () => { it('should not change the styles', () => { - var cs = processStyles(ViewEncapsulation.NATIVE, 'someComponent', ['.one {}']); + var cs = processStyles(ViewEncapsulation.Native, 'someComponent', ['.one {}']); expect(cs[0]).toEqual('.one {}'); }); }); - describe('ViewEncapsulation.EMULATED', () => { + describe('ViewEncapsulation.Emulated', () => { it('should scope styles', () => { - var cs = processStyles(ViewEncapsulation.EMULATED, 'someComponent', ['.foo {} :host {}']); + var cs = processStyles(ViewEncapsulation.Emulated, 'someComponent', ['.foo {} :host {}']); expect(cs[0]).toEqual(".foo[_ngcontent-someapp-0] {\n\n}\n\n[_nghost-someapp-0] {\n\n}"); }); it('should return the same style given the same component', () => { var style = '.foo {} :host {}'; - var cs1 = processStyles(ViewEncapsulation.EMULATED, 'someComponent', [style]); - var cs2 = processStyles(ViewEncapsulation.EMULATED, 'someComponent', [style]); + var cs1 = processStyles(ViewEncapsulation.Emulated, 'someComponent', [style]); + var cs2 = processStyles(ViewEncapsulation.Emulated, 'someComponent', [style]); expect(cs1[0]).toEqual(cs2[0]); }); it('should return different styles given different components', () => { var style = '.foo {} :host {}'; - var cs1 = processStyles(ViewEncapsulation.EMULATED, 'someComponent1', [style]); - var cs2 = processStyles(ViewEncapsulation.EMULATED, 'someComponent2', [style]); + var cs1 = processStyles(ViewEncapsulation.Emulated, 'someComponent1', [style]); + var cs2 = processStyles(ViewEncapsulation.Emulated, 'someComponent2', [style]); expect(cs1[0]).not.toEqual(cs2[0]); }); @@ -101,13 +101,13 @@ export function main() { it('should add a host attribute to component proto views', () => { var template = DOM.createTemplate('
'); var protoViewBuilder = - processElements(ViewEncapsulation.EMULATED, 'someComponent', template); + processElements(ViewEncapsulation.Emulated, 'someComponent', template); expect(protoViewBuilder.hostAttributes.get('_nghost-someapp-0')).toEqual(''); }); it('should not add a host attribute to embedded proto views', () => { var template = DOM.createTemplate('
'); - var protoViewBuilder = processElements(ViewEncapsulation.EMULATED, 'someComponent', + var protoViewBuilder = processElements(ViewEncapsulation.Emulated, 'someComponent', template, ViewType.EMBEDDED); expect(protoViewBuilder.hostAttributes.size).toBe(0); }); @@ -115,19 +115,19 @@ export function main() { it('should not add a host attribute to host proto views', () => { var template = DOM.createTemplate('
'); var protoViewBuilder = - processElements(ViewEncapsulation.EMULATED, 'someComponent', template, ViewType.HOST); + processElements(ViewEncapsulation.Emulated, 'someComponent', template, ViewType.HOST); expect(protoViewBuilder.hostAttributes.size).toBe(0); }); it('should add an attribute to the content elements', () => { var template = DOM.createTemplate('
'); - processElements(ViewEncapsulation.EMULATED, 'someComponent', template); + processElements(ViewEncapsulation.Emulated, 'someComponent', template); expect(DOM.getInnerHTML(template)).toEqual('
'); }); it('should not add an attribute to the content elements for host views', () => { var template = DOM.createTemplate('
'); - processElements(ViewEncapsulation.EMULATED, 'someComponent', template, ViewType.HOST); + processElements(ViewEncapsulation.Emulated, 'someComponent', template, ViewType.HOST); expect(DOM.getInnerHTML(template)).toEqual('
'); }); }); diff --git a/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts b/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts index 6d93ed7fd5..1a92ec154b 100644 --- a/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts +++ b/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts @@ -215,7 +215,7 @@ export function main() { componentId: 'someComponent', template: 'hello', directives: [], - encapsulation: ViewEncapsulation.NATIVE + encapsulation: ViewEncapsulation.Native }) ]) .then((protoViewMergeMappings) => { @@ -234,7 +234,7 @@ export function main() { componentId: 'someComponent', template: '', directives: [], - encapsulation: ViewEncapsulation.NATIVE, + encapsulation: ViewEncapsulation.Native, styles: ['a {};'] }) ]) @@ -244,7 +244,7 @@ export function main() { componentId: 'someComponent', template: '', directives: [], - encapsulation: ViewEncapsulation.NONE, + encapsulation: ViewEncapsulation.None, styles: ['b {};'] })) .then(_ => { @@ -254,7 +254,7 @@ export function main() { componentId: 'someComponent', template: '', directives: [], - encapsulation: ViewEncapsulation.NONE, + encapsulation: ViewEncapsulation.None, styles: ['c {};'] })) .then(_ => { diff --git a/modules/angular2/test/core/render/dom/view/proto_view_builder_spec.ts b/modules/angular2/test/core/render/dom/view/proto_view_builder_spec.ts index 048161118b..795a5301d2 100644 --- a/modules/angular2/test/core/render/dom/view/proto_view_builder_spec.ts +++ b/modules/angular2/test/core/render/dom/view/proto_view_builder_spec.ts @@ -29,7 +29,7 @@ export function main() { beforeEach(() => { templateCloner = new TemplateCloner(-1); builder = - new ProtoViewBuilder(DOM.createTemplate(''), ViewType.EMBEDDED, ViewEncapsulation.NONE); + new ProtoViewBuilder(DOM.createTemplate(''), ViewType.EMBEDDED, ViewEncapsulation.None); }); if (!IS_DART) { diff --git a/modules/angular2/test/core/render/dom/view/proto_view_merger_integration_spec.ts b/modules/angular2/test/core/render/dom/view/proto_view_merger_integration_spec.ts index d9a5418673..62f7a57552 100644 --- a/modules/angular2/test/core/render/dom/view/proto_view_merger_integration_spec.ts +++ b/modules/angular2/test/core/render/dom/view/proto_view_merger_integration_spec.ts @@ -264,7 +264,7 @@ export function main() { tb.compiler.compileHost(rootDirective('root')) .then((rootProtoViewDto) => { var builder = new ProtoViewBuilder(DOM.createTemplate(''), ViewType.COMPONENT, - ViewEncapsulation.NONE); + ViewEncapsulation.None); builder.setHostAttribute('a', 'b'); var componentProtoViewDto = builder.build(new ElementSchemaRegistry(), cloner); tb.merge([rootProtoViewDto, componentProtoViewDto]) @@ -294,8 +294,8 @@ function runAndAssert(hostElementName: string, componentTemplates: string[], cloner: TemplateCloner) => { tb.compileAndMerge(rootComp, componentTemplates.map(template => componentView( template, useNativeEncapsulation ? - ViewEncapsulation.NATIVE : - ViewEncapsulation.NONE))) + ViewEncapsulation.Native : + ViewEncapsulation.None))) .then((mergeMappings) => { expect(stringify(cloner, mergeMappings)).toEqual(expectedFragments); async.done(); @@ -309,7 +309,7 @@ function rootDirective(hostElementName: string) { } function componentView(template: string, - encapsulation: ViewEncapsulation = ViewEncapsulation.NONE) { + encapsulation: ViewEncapsulation = ViewEncapsulation.None) { return new ViewDefinition({ componentId: 'someComp', template: template, diff --git a/modules/angular2_material/src/components/button/button.ts b/modules/angular2_material/src/components/button/button.ts index 35bba058ff..fb11460451 100644 --- a/modules/angular2_material/src/components/button/button.ts +++ b/modules/angular2_material/src/components/button/button.ts @@ -17,7 +17,7 @@ import {isPresent} from 'angular2/src/core/facade/lang'; }) @View({ templateUrl: 'package:angular2_material/src/components/button/button.html', - encapsulation: ViewEncapsulation.NONE, + encapsulation: ViewEncapsulation.None, }) export class MdButton { /** Whether a mousedown has occured on this element in the last 100ms. */ @@ -61,7 +61,7 @@ export class MdButton { }) @View({ templateUrl: 'package:angular2_material/src/components/button/button.html', - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) export class MdAnchor extends MdButton { tabIndex: number; diff --git a/modules/angular2_material/src/components/checkbox/checkbox.ts b/modules/angular2_material/src/components/checkbox/checkbox.ts index 97d7aada66..18187f3156 100644 --- a/modules/angular2_material/src/components/checkbox/checkbox.ts +++ b/modules/angular2_material/src/components/checkbox/checkbox.ts @@ -18,7 +18,7 @@ import {NumberWrapper} from 'angular2/src/core/facade/lang'; @View({ templateUrl: 'package:angular2_material/src/components/checkbox/checkbox.html', directives: [], - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) export class MdCheckbox { /** Whether this checkbox is checked. */ diff --git a/modules/angular2_material/src/components/dialog/dialog.ts b/modules/angular2_material/src/components/dialog/dialog.ts index 4ac7360f2f..e8fbbd2b14 100644 --- a/modules/angular2_material/src/components/dialog/dialog.ts +++ b/modules/angular2_material/src/components/dialog/dialog.ts @@ -210,7 +210,7 @@ export class MdDialogConfig { }, }) @View({ - encapsulation: ViewEncapsulation.NONE, + encapsulation: ViewEncapsulation.None, templateUrl: 'package:angular2_material/src/components/dialog/dialog.html', directives: [forwardRef(() => MdDialogContent)] }) @@ -258,7 +258,7 @@ class MdDialogContent { '(click)': 'onClick()', }, }) -@View({template: '', encapsulation: ViewEncapsulation.NONE}) +@View({template: '', encapsulation: ViewEncapsulation.None}) class MdBackdrop { dialogRef: MdDialogRef; diff --git a/modules/angular2_material/src/components/grid_list/grid_list.ts b/modules/angular2_material/src/components/grid_list/grid_list.ts index d7b3119f7b..6b77b78db0 100644 --- a/modules/angular2_material/src/components/grid_list/grid_list.ts +++ b/modules/angular2_material/src/components/grid_list/grid_list.ts @@ -32,7 +32,7 @@ class RowHeightMode { }) @View({ templateUrl: 'package:angular2_material/src/components/grid_list/grid_list.html', - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) export class MdGridList { /** Array of tiles that are being rendered. */ @@ -230,7 +230,7 @@ export class MdGridList { }) @View({ templateUrl: 'package:angular2_material/src/components/grid_list/grid_tile.html', - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) export class MdGridTile { gridList: MdGridList; diff --git a/modules/angular2_material/src/components/progress-circular/progress_circular.ts b/modules/angular2_material/src/components/progress-circular/progress_circular.ts index 8102acff43..9e0a6a3999 100644 --- a/modules/angular2_material/src/components/progress-circular/progress_circular.ts +++ b/modules/angular2_material/src/components/progress-circular/progress_circular.ts @@ -3,7 +3,7 @@ import {Component, View, ViewEncapsulation} from 'angular2/angular2'; @Component({selector: 'md-progress-circular'}) @View({ templateUrl: 'package:angular2_material/src/components/progress-circular/progress_circular.html', - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) export class MdProgressCircular { constructor() {} diff --git a/modules/angular2_material/src/components/progress-linear/progress_linear.ts b/modules/angular2_material/src/components/progress-linear/progress_linear.ts index 0d053ffb7c..ab094632a2 100644 --- a/modules/angular2_material/src/components/progress-linear/progress_linear.ts +++ b/modules/angular2_material/src/components/progress-linear/progress_linear.ts @@ -27,7 +27,7 @@ class ProgressMode { @View({ templateUrl: 'package:angular2_material/src/components/progress-linear/progress_linear.html', directives: [], - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) export class MdProgressLinear { /** Value for the primary bar. */ diff --git a/modules/angular2_material/src/components/radio/radio_button.ts b/modules/angular2_material/src/components/radio/radio_button.ts index 760cbe7d1a..a3eb3b3dd9 100644 --- a/modules/angular2_material/src/components/radio/radio_button.ts +++ b/modules/angular2_material/src/components/radio/radio_button.ts @@ -47,7 +47,7 @@ var _uniqueIdCounter: number = 0; }) @View({ templateUrl: 'package:angular2_material/src/components/radio/radio_group.html', - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) export class MdRadioGroup { /** The selected value for the radio group. The value comes from the options. */ @@ -205,7 +205,7 @@ export class MdRadioGroup { @View({ templateUrl: 'package:angular2_material/src/components/radio/radio_button.html', directives: [], - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) export class MdRadioButton { /** Whether this radio is checked. */ diff --git a/modules/angular2_material/src/components/switcher/switch.ts b/modules/angular2_material/src/components/switcher/switch.ts index 03713508ea..c8cb9f1519 100644 --- a/modules/angular2_material/src/components/switcher/switch.ts +++ b/modules/angular2_material/src/components/switcher/switch.ts @@ -17,7 +17,7 @@ import {MdCheckbox} from "../checkbox/checkbox"; @View({ templateUrl: 'package:angular2_material/src/components/switcher/switch.html', directives: [], - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) export class MdSwitch extends MdCheckbox { constructor(@Attribute('tabindex') tabindex: string) { diff --git a/modules/examples/src/material/button/index.ts b/modules/examples/src/material/button/index.ts index 1d7e6969ac..b40359782a 100644 --- a/modules/examples/src/material/button/index.ts +++ b/modules/examples/src/material/button/index.ts @@ -10,7 +10,7 @@ import {bind} from 'angular2/di'; @View({ templateUrl: './demo_app.html', directives: [MdButton, MdAnchor, NgFor], - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) class DemoApp { previousClick: string; diff --git a/modules/examples/src/material/checkbox/index.ts b/modules/examples/src/material/checkbox/index.ts index 8f258cceb7..03c8e59e03 100644 --- a/modules/examples/src/material/checkbox/index.ts +++ b/modules/examples/src/material/checkbox/index.ts @@ -10,7 +10,7 @@ import {bind} from 'angular2/di'; @View({ templateUrl: './demo_app.html', directives: [MdCheckbox], - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) class DemoApp { toggleCount: number; diff --git a/modules/examples/src/material/dialog/index.ts b/modules/examples/src/material/dialog/index.ts index a220f6ef05..17928a92a9 100644 --- a/modules/examples/src/material/dialog/index.ts +++ b/modules/examples/src/material/dialog/index.ts @@ -24,7 +24,7 @@ import {isPresent} from 'angular2/src/core/facade/lang'; @View({ templateUrl: './demo_app.html', directives: [], - encapsulation: ViewEncapsulation.NONE, + encapsulation: ViewEncapsulation.None, }) class DemoApp { dialog: MdDialog; @@ -70,7 +70,7 @@ class DemoApp { properties: ['numCoconuts'], }) @View({ - encapsulation: ViewEncapsulation.NONE, + encapsulation: ViewEncapsulation.None, template: `

This is the dialog content

There are {{numCoconuts}} coconuts.

diff --git a/modules/examples/src/material/grid_list/index.ts b/modules/examples/src/material/grid_list/index.ts index 21b7d8eea1..46938877a5 100644 --- a/modules/examples/src/material/grid_list/index.ts +++ b/modules/examples/src/material/grid_list/index.ts @@ -10,7 +10,7 @@ import {bind} from 'angular2/di'; @View({ templateUrl: './demo_app.html', directives: [MdGridList, MdGridTile], - encapsulation: ViewEncapsulation.NONE, + encapsulation: ViewEncapsulation.None, }) class DemoApp { tile3RowSpan: number; diff --git a/modules/examples/src/material/input/index.ts b/modules/examples/src/material/input/index.ts index fa23b8bbce..7cd5c134d2 100644 --- a/modules/examples/src/material/input/index.ts +++ b/modules/examples/src/material/input/index.ts @@ -8,7 +8,7 @@ import {bind} from 'angular2/di'; @View({ templateUrl: './demo_app.html', directives: [MdInputContainer, MdInput], - encapsulation: ViewEncapsulation.NONE + encapsulation: ViewEncapsulation.None }) class DemoApp { constructor() {} diff --git a/modules/examples/src/material/progress-linear/index.ts b/modules/examples/src/material/progress-linear/index.ts index 1be1ce1bf0..e1b108b563 100644 --- a/modules/examples/src/material/progress-linear/index.ts +++ b/modules/examples/src/material/progress-linear/index.ts @@ -10,7 +10,7 @@ import {bind} from 'angular2/di'; @View({ templateUrl: './demo_app.html', directives: [MdProgressLinear], - encapsulation: ViewEncapsulation.NONE, + encapsulation: ViewEncapsulation.None, }) class DemoApp { progress: number; diff --git a/modules/examples/src/material/radio/index.ts b/modules/examples/src/material/radio/index.ts index a44a4a24f7..f2fb374474 100644 --- a/modules/examples/src/material/radio/index.ts +++ b/modules/examples/src/material/radio/index.ts @@ -12,7 +12,7 @@ import {bind} from 'angular2/di'; @View({ templateUrl: './demo_app.html', directives: [MdRadioGroup, MdRadioButton], - encapsulation: ViewEncapsulation.NONE, + encapsulation: ViewEncapsulation.None, }) class DemoApp { thirdValue; diff --git a/modules/examples/src/material/switcher/index.ts b/modules/examples/src/material/switcher/index.ts index 588f8c0fe9..c4efc76d15 100644 --- a/modules/examples/src/material/switcher/index.ts +++ b/modules/examples/src/material/switcher/index.ts @@ -10,7 +10,7 @@ import {bind} from 'angular2/di'; @View({ templateUrl: './demo_app.html', directives: [MdSwitch], - encapsulation: ViewEncapsulation.NONE, + encapsulation: ViewEncapsulation.None, }) class DemoApp { toggleCount: number;