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 7b52c47e9b..48e64988c6 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 @@ -253,7 +253,7 @@ describe('compiler compliance: styling', () => { template: function MyComponent_Template(rf, $ctx$) { if (rf & 1) { $r3$.ɵelementStart(0, "div"); - $r3$.ɵelementStyling(null, null, $r3$.ɵzss); + $r3$.ɵelementStyling(null, null, $r3$.ɵdefaultStyleSanitizer); $r3$.ɵelementEnd(); } if (rf & 2) { @@ -310,7 +310,7 @@ describe('compiler compliance: styling', () => { template: function MyComponent_Template(rf, $ctx$) { if (rf & 1) { $r3$.ɵelementStart(0, "div", $e0_attrs$); - $r3$.ɵelementStyling(null, $e0_styling$, $r3$.ɵzss); + $r3$.ɵelementStyling(null, $e0_styling$, $r3$.ɵdefaultStyleSanitizer); $r3$.ɵelementEnd(); } if (rf & 2) { @@ -318,7 +318,7 @@ describe('compiler compliance: styling', () => { $r3$.ɵelementStylingProp(0, 1, $ctx$.myWidth); $r3$.ɵelementStylingProp(0, 2, $ctx$.myHeight); $r3$.ɵelementStylingApply(0); - $r3$.ɵelementAttribute(0, "style", $r3$.ɵbind("border-width: 10px"), $r3$.ɵzs); + $r3$.ɵelementAttribute(0, "style", $r3$.ɵbind("border-width: 10px"), $r3$.ɵsanitizeStyle); } } }); @@ -369,7 +369,7 @@ describe('compiler compliance: styling', () => { template: function MyComponent_Template(rf, ctx) { if (rf & 1) { $r3$.ɵelementStart(0, "div"); - $r3$.ɵelementStyling(null, _c0, $r3$.ɵzss); + $r3$.ɵelementStyling(null, _c0, $r3$.ɵdefaultStyleSanitizer); $r3$.ɵelementEnd(); } if (rf & 2) { @@ -529,7 +529,7 @@ describe('compiler compliance: styling', () => { } if (rf & 2) { $r3$.ɵelementAttribute(0, "class", $r3$.ɵbind("round")); - $r3$.ɵelementAttribute(0, "style", $r3$.ɵbind("height:100px"), $r3$.ɵzs); + $r3$.ɵelementAttribute(0, "style", $r3$.ɵbind("height:100px"), $r3$.ɵsanitizeStyle); } } }); diff --git a/packages/compiler/src/render3/r3_identifiers.ts b/packages/compiler/src/render3/r3_identifiers.ts index 2cdb217b0f..63f18d7707 100644 --- a/packages/compiler/src/render3/r3_identifiers.ts +++ b/packages/compiler/src/render3/r3_identifiers.ts @@ -193,10 +193,12 @@ export class Identifiers { }; // sanitization-related functions - static sanitizeHtml: o.ExternalReference = {name: 'ɵzh', moduleName: CORE}; - static sanitizeStyle: o.ExternalReference = {name: 'ɵzs', moduleName: CORE}; - static defaultStyleSanitizer: o.ExternalReference = {name: 'ɵzss', moduleName: CORE}; - static sanitizeResourceUrl: o.ExternalReference = {name: 'ɵzr', moduleName: CORE}; - static sanitizeScript: o.ExternalReference = {name: 'ɵzc', moduleName: CORE}; - static sanitizeUrl: o.ExternalReference = {name: 'ɵzu', moduleName: CORE}; + static sanitizeHtml: o.ExternalReference = {name: 'ɵsanitizeHtml', moduleName: CORE}; + static sanitizeStyle: o.ExternalReference = {name: 'ɵsanitizeStyle', moduleName: CORE}; + static defaultStyleSanitizer: + o.ExternalReference = {name: 'ɵdefaultStyleSanitizer', moduleName: CORE}; + static sanitizeResourceUrl: + o.ExternalReference = {name: 'ɵsanitizeResourceUrl', moduleName: CORE}; + static sanitizeScript: o.ExternalReference = {name: 'ɵsanitizeScript', moduleName: CORE}; + static sanitizeUrl: o.ExternalReference = {name: 'ɵsanitizeUrl', moduleName: CORE}; } diff --git a/packages/core/src/render3/jit/environment.ts b/packages/core/src/render3/jit/environment.ts index b401c89640..328027eca3 100644 --- a/packages/core/src/render3/jit/environment.ts +++ b/packages/core/src/render3/jit/environment.ts @@ -102,10 +102,10 @@ export const angularCoreEnv: {[name: string]: Function} = { 'ɵembeddedViewStart': r3.embeddedViewStart, 'ɵembeddedViewEnd': r3.embeddedViewEnd, - 'ɵzh': sanitization.sanitizeHtml, - 'ɵzs': sanitization.sanitizeStyle, - 'ɵzss': sanitization.defaultStyleSanitizer, - 'ɵzr': sanitization.sanitizeResourceUrl, - 'ɵzc': sanitization.sanitizeScript, - 'ɵzu': sanitization.sanitizeUrl + 'ɵsanitizeHtml': sanitization.sanitizeHtml, + 'ɵsanitizeStyle': sanitization.sanitizeStyle, + 'ɵdefaultStyleSanitizer': sanitization.defaultStyleSanitizer, + 'ɵsanitizeResourceUrl': sanitization.sanitizeResourceUrl, + 'ɵsanitizeScript': sanitization.sanitizeScript, + 'ɵsanitizeUrl': sanitization.sanitizeUrl };