diff --git a/modules/benchmarks/src/largetable/render3/table.ts b/modules/benchmarks/src/largetable/render3/table.ts index 38ba1c11b8..d57cf0cc60 100644 --- a/modules/benchmarks/src/largetable/render3/table.ts +++ b/modules/benchmarks/src/largetable/render3/table.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementStart, ɵelementStyling, ɵelementStylingProp, ɵembeddedViewEnd, ɵembeddedViewStart, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core'; +import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementStart, ɵelementStyleProp, ɵelementStyling, ɵembeddedViewEnd, ɵembeddedViewStart, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core'; import {ComponentDefInternal} from '@angular/core/src/render3/interfaces/definition'; import {TableCell, buildTable, emptyTable} from '../util'; @@ -55,7 +55,7 @@ export class LargeTableComponent { ɵelementEnd(); } if (rf2 & ɵRenderFlags.Update) { - ɵelementStylingProp(0, 0, null, cell.row % 2 ? '' : 'grey'); + ɵelementStyleProp(0, 0, null, cell.row % 2 ? '' : 'grey'); ɵtextBinding(1, ɵbind(cell.value)); } } diff --git a/modules/benchmarks/src/tree/render3/tree.ts b/modules/benchmarks/src/tree/render3/tree.ts index 5514f3e883..25aae817a7 100644 --- a/modules/benchmarks/src/tree/render3/tree.ts +++ b/modules/benchmarks/src/tree/render3/tree.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementProperty, ɵelementStart, ɵelementStyling as s, ɵelementStylingProp, ɵembeddedViewEnd, ɵembeddedViewStart, ɵinterpolation1, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core'; +import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementProperty, ɵelementStart, ɵelementStyleProp, ɵelementStyling as s, ɵembeddedViewEnd, ɵembeddedViewStart, ɵinterpolation1, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core'; import {TreeNode, buildTree, emptyTree} from '../util'; @@ -50,7 +50,7 @@ export class TreeComponent { ɵcontainer(3); } if (rf & ɵRenderFlags.Update) { - ɵelementStylingProp(0, 0, ctx.data.depth % 2 ? '' : 'grey'); + ɵelementStyleProp(0, 0, ctx.data.depth % 2 ? '' : 'grey'); ɵtextBinding(1, ɵinterpolation1(' ', ctx.data.value, ' ')); ɵcontainerRefreshStart(2); { @@ -127,7 +127,7 @@ export function TreeTpl(rf: ɵRenderFlags, ctx: TreeNode) { ɵelementEnd(); } if (rf & ɵRenderFlags.Update) { - ɵelementStylingProp(1, 0, ctx.depth % 2 ? '' : 'grey'); + ɵelementStyleProp(1, 0, ctx.depth % 2 ? '' : 'grey'); ɵtextBinding(2, ɵinterpolation1(' ', ctx.value, ' ')); ɵcontainerRefreshStart(3); { diff --git a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts index 3807942c83..cded85e3e9 100644 --- a/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts +++ b/packages/compiler-cli/test/compliance/r3_compiler_compliance_spec.ts @@ -425,7 +425,7 @@ describe('compiler compliance', () => { $r3$.ɵelementEnd(); } if (rf & 2) { - $r3$.ɵelementStylingProp(0, 0, ctx.color); + $r3$.ɵelementStyleProp(0, 0, ctx.color); $r3$.ɵelementClassProp(0, 0, ctx.error); $r3$.ɵelementStylingApply(0); } @@ -674,10 +674,10 @@ describe('compiler compliance', () => { MyComponent.ngComponentDef = $r3$.ɵdefineComponent({ type: MyComponent, selectors: [["my-component"]], - factory: function MyComponent_Factory(t) { + factory: function MyComponent_Factory(t) { return new (t || MyComponent)( - $r3$.ɵdirectiveInject(ElementRef), $r3$.ɵdirectiveInject(ViewContainerRef), - $r3$.ɵdirectiveInject(ChangeDetectorRef)); + $r3$.ɵdirectiveInject(ElementRef), $r3$.ɵdirectiveInject(ViewContainerRef), + $r3$.ɵdirectiveInject(ChangeDetectorRef)); }, features: [$r3$.ɵPublicFeature], consts: 0, diff --git a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts index a66a90230e..491488e059 100644 --- a/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts +++ b/packages/compiler-cli/test/compliance/r3_view_compiler_styling_spec.ts @@ -315,8 +315,8 @@ describe('compiler compliance: styling', () => { } if (rf & 2) { $r3$.ɵelementStylingMap(0, null, $ctx$.myStyleExp); - $r3$.ɵelementStylingProp(0, 1, $ctx$.myWidth); - $r3$.ɵelementStylingProp(0, 2, $ctx$.myHeight); + $r3$.ɵelementStyleProp(0, 1, $ctx$.myWidth); + $r3$.ɵelementStyleProp(0, 2, $ctx$.myHeight); $r3$.ɵelementStylingApply(0); $r3$.ɵelementAttribute(0, "style", $r3$.ɵbind("border-width: 10px"), $r3$.ɵsanitizeStyle); } @@ -373,7 +373,7 @@ describe('compiler compliance: styling', () => { $r3$.ɵelementEnd(); } if (rf & 2) { - $r3$.ɵelementStylingProp(0, 0, ctx.myImage); + $r3$.ɵelementStyleProp(0, 0, ctx.myImage); $r3$.ɵelementStylingApply(0); } } diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts index b3c892ada3..ee82bc116d 100644 --- a/packages/compiler/src/render3/r3_identifiers.ts +++ b/packages/compiler/src/render3/r3_identifiers.ts @@ -43,7 +43,7 @@ export class Identifiers { static elementStylingMap: o.ExternalReference = {name: 'ɵelementStylingMap', moduleName: CORE}; - static elementStyleProp: o.ExternalReference = {name: 'ɵelementStylingProp', moduleName: CORE}; + static elementStyleProp: o.ExternalReference = {name: 'ɵelementStyleProp', moduleName: CORE}; static elementStylingApply: o.ExternalReference = {name: 'ɵelementStylingApply', moduleName: CORE}; diff --git a/packages/core/src/core_render3_private_export.ts b/packages/core/src/core_render3_private_export.ts index 03f83f5939..97fe44fedf 100644 --- a/packages/core/src/core_render3_private_export.ts +++ b/packages/core/src/core_render3_private_export.ts @@ -89,7 +89,7 @@ export { elementAttribute as ɵelementAttribute, elementStyling as ɵelementStyling, elementStylingMap as ɵelementStylingMap, - elementStyleProp as ɵelementStylingProp, + elementStyleProp as ɵelementStyleProp, elementStylingApply as ɵelementStylingApply, elementClassProp as ɵelementClassProp, textBinding as ɵtextBinding, diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts index 717bafdd4d..37db8319a1 100644 --- a/packages/core/src/render3/jit/environment.ts +++ b/packages/core/src/render3/jit/environment.ts @@ -92,7 +92,7 @@ export const angularCoreEnv: {[name: string]: Function} = { 'ɵreference': r3.reference, 'ɵelementStyling': r3.elementStyling, 'ɵelementStylingMap': r3.elementStylingMap, - 'ɵelementStylingProp': r3.elementStyleProp, + 'ɵelementStyleProp': r3.elementStyleProp, 'ɵelementStylingApply': r3.elementStylingApply, 'ɵtemplate': r3.template, 'ɵtext': r3.text, diff --git a/packages/core/test/render3/compiler_canonical/elements_spec.ts b/packages/core/test/render3/compiler_canonical/elements_spec.ts index c776f17f11..55ddca2166 100644 --- a/packages/core/test/render3/compiler_canonical/elements_spec.ts +++ b/packages/core/test/render3/compiler_canonical/elements_spec.ts @@ -345,8 +345,8 @@ describe('elements', () => { $r3$.ɵelementEnd(); } if (rf & 2) { - $r3$.ɵelementStylingProp(0, 0, ctx.someColor); - $r3$.ɵelementStylingProp(0, 1, ctx.someWidth, 'px'); + $r3$.ɵelementStyleProp(0, 0, ctx.someColor); + $r3$.ɵelementStyleProp(0, 1, ctx.someWidth, 'px'); $r3$.ɵelementStylingApply(0); } } diff --git a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts index cf8d2ccea2..4ce6440bde 100644 --- a/packages/core/test/render3/compiler_canonical/sanitize_spec.ts +++ b/packages/core/test/render3/compiler_canonical/sanitize_spec.ts @@ -53,7 +53,7 @@ describe('compiler sanitization', () => { if (rf & 2) { $r3$.ɵelementProperty(0, 'innerHTML', $r3$.ɵbind(ctx.innerHTML), $r3$.ɵsanitizeHtml); $r3$.ɵelementProperty(0, 'hidden', $r3$.ɵbind(ctx.hidden)); - $r3$.ɵelementStylingProp(0, 0, ctx.style); + $r3$.ɵelementStyleProp(0, 0, ctx.style); $r3$.ɵelementStylingApply(0); $r3$.ɵelementProperty(1, 'src', $r3$.ɵbind(ctx.url), $r3$.ɵsanitizeUrl); $r3$.ɵelementAttribute(1, 'srcset', $r3$.ɵbind(ctx.url), $r3$.ɵsanitizeUrl);