From 4b415bc7959db175d821fff1f14dc78d967da9fc Mon Sep 17 00:00:00 2001 From: jojohoch <joachim.hoch@iqb.hu-berlin.de> Date: Fri, 14 Jul 2023 12:50:08 +0200 Subject: [PATCH] [player] Fix the player's executability - Remove SanitazationService from player - Extend interface ButtonEvent --- projects/common/models/elements/button/button.ts | 5 +++-- projects/player/src/app/components/unit/unit.component.ts | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/projects/common/models/elements/button/button.ts b/projects/common/models/elements/button/button.ts index be53892c0..e60ab1cb4 100644 --- a/projects/common/models/elements/button/button.ts +++ b/projects/common/models/elements/button/button.ts @@ -3,6 +3,7 @@ import { UIElement, UIElementProperties, UIElementType } from 'common/models/ele import { ButtonComponent } from 'common/components/button/button.component'; import { ElementComponent } from 'common/directives/element-component.directive'; import { BasicStyles, BorderStyles } from 'common/models/elements/property-group-interfaces'; +import { StateVariable } from 'common/models/state-variable'; export class ButtonElement extends UIElement implements ButtonProperties { type: UIElementType = 'button'; @@ -39,8 +40,8 @@ export interface ButtonProperties extends UIElementProperties { export interface ButtonEvent { action: ButtonAction; - param: UnitNavParam | number | string; + param: UnitNavParam | number | string | StateVariable } -export type ButtonAction = 'unitNav' | 'pageNav' | 'highlightText'; +export type ButtonAction = 'unitNav' | 'pageNav' | 'highlightText' | 'stateVariableChange'; export type UnitNavParam = 'previous' | 'next' | 'first' | 'last' | 'end'; diff --git a/projects/player/src/app/components/unit/unit.component.ts b/projects/player/src/app/components/unit/unit.component.ts index 9fd60be6b..fc5b35fc9 100644 --- a/projects/player/src/app/components/unit/unit.component.ts +++ b/projects/player/src/app/components/unit/unit.component.ts @@ -44,9 +44,7 @@ export class UnitComponent implements OnInit { this.reset(); if (message.unitDefinition) { - const unitDefinition: Unit = new Unit( - this.sanitizationService.sanitizeUnitDefinition(JSON.parse(message.unitDefinition)) - ); + const unitDefinition: Unit = new Unit(JSON.parse(message.unitDefinition)); LogService.debug('player: unitDefinition', unitDefinition); this.pages = unitDefinition.pages; this.playerConfig = message.playerConfig || {}; -- GitLab