From b5ce25350d50f37f5dceec6e620c6b3fcde9db1b Mon Sep 17 00:00:00 2001 From: jojohoch <joachim.hoch@iqb.hu-berlin.de> Date: Wed, 7 Sep 2022 09:40:19 +0200 Subject: [PATCH] Use pipe `safeResourceHTML` instead of method to sanitize innerHTML --- .../components/compound-elements/likert/likert.component.ts | 2 +- .../components/input-elements/radio-button-group.component.ts | 2 +- .../components/input-elements/radio-group-images.component.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/common/components/compound-elements/likert/likert.component.ts b/projects/common/components/compound-elements/likert/likert.component.ts index b82960fdc..19afd7dd2 100644 --- a/projects/common/components/compound-elements/likert/likert.component.ts +++ b/projects/common/components/compound-elements/likert/likert.component.ts @@ -52,7 +52,7 @@ import { LikertRadioButtonGroupComponent } from './likert-radio-button-group.com <img *ngIf="column.imgSrc && column.imgPosition === 'above'" [src]="column.imgSrc | safeResourceUrl" alt="Image Placeholder" [style.object-fit]="'scale-down'"> - <div [innerHTML]="sanitizer.bypassSecurityTrustHtml(column.text)"></div> + <div [innerHTML]="column.text | safeResourceHTML"></div> <img *ngIf="column.imgSrc && column.imgPosition === 'below'" [src]="column.imgSrc | safeResourceUrl" alt="Image Placeholder" [style.object-fit]="'scale-down'"> diff --git a/projects/common/components/input-elements/radio-button-group.component.ts b/projects/common/components/input-elements/radio-button-group.component.ts index 542fbad7d..eb74fde24 100644 --- a/projects/common/components/input-elements/radio-button-group.component.ts +++ b/projects/common/components/input-elements/radio-button-group.component.ts @@ -30,7 +30,7 @@ import { FormElementComponent } from '../../directives/form-element-component.di [value]="i" [style.pointer-events]="elementModel.readOnly ? 'none' : 'unset'" [style.line-height.%]="elementModel.styling.lineHeight"> - <div class="radio-button-label" [innerHTML]="sanitizer.bypassSecurityTrustHtml(option.text)"></div> + <div class="radio-button-label" [innerHTML]="option.text | safeResourceHTML"></div> </mat-radio-button> <mat-error *ngIf="elementFormControl.errors && elementFormControl.touched" class="error-message"> diff --git a/projects/common/components/input-elements/radio-group-images.component.ts b/projects/common/components/input-elements/radio-group-images.component.ts index 161d30f69..04fb2520b 100644 --- a/projects/common/components/input-elements/radio-group-images.component.ts +++ b/projects/common/components/input-elements/radio-group-images.component.ts @@ -22,7 +22,7 @@ import { FormElementComponent } from '../../directives/form-element-component.di [style.object-fit]="'scale-down'" [style.max-width.%]="100" [src]="option.imgSrc | safeResourceUrl" alt="Image Placeholder"> - <div [innerHTML]="sanitizer.bypassSecurityTrustHtml(option.text)" + <div [innerHTML]="option.text | safeResourceHTML" [style.background-color]="elementModel.styling.backgroundColor" [style.color]="elementModel.styling.fontColor" [style.font-family]="elementModel.styling.font" -- GitLab