From 18780d67a0de258de3a461da5f6d5e8eedaac89c Mon Sep 17 00:00:00 2001
From: jojohoch <joachim.hoch@iqb.hu-berlin.de>
Date: Sat, 22 Jan 2022 11:00:01 +0100
Subject: [PATCH] [player] Refactor parameters of `TextMarker.applySelection`
---
projects/player/src/app/classes/text-marker.ts | 2 +-
.../element-container/element-container.component.html | 2 +-
.../element-container/element-container.component.ts | 7 +++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/projects/player/src/app/classes/text-marker.ts b/projects/player/src/app/classes/text-marker.ts
index 8f884f510..b7fac0348 100644
--- a/projects/player/src/app/classes/text-marker.ts
+++ b/projects/player/src/app/classes/text-marker.ts
@@ -6,12 +6,12 @@ export class TextMarker {
static applySelection(
mode: 'mark' | 'delete',
color: string,
- element: HTMLElement,
textComponent: TextComponent
): void {
const selection = window.getSelection();
if (selection && TextMarker.isSelectionValid(selection) && selection.rangeCount > 0) {
const range = selection.getRangeAt(0);
+ const element = textComponent.textContainerRef.nativeElement;
if (TextMarker.isRangeInside(range, element)) {
TextMarker.applyRange(range, selection, mode === 'delete', color);
textComponent.elementValueChanged.emit({
diff --git a/projects/player/src/app/components/element-container/element-container.component.html b/projects/player/src/app/components/element-container/element-container.component.html
index 2894e6679..256d6d35b 100644
--- a/projects/player/src/app/components/element-container/element-container.component.html
+++ b/projects/player/src/app/components/element-container/element-container.component.html
@@ -22,5 +22,5 @@
[overlayOrigin]="overlayOrigin"
[positions]="positions"
[isMarkingBarOpen]="isMarkingBarOpen"
- (applySelection)="apply($event.mode, $event.color)">
+ (applySelection)="applySelectiontoText($event.mode, $event.color)">
</app-floating-marking-bar>
diff --git a/projects/player/src/app/components/element-container/element-container.component.ts b/projects/player/src/app/components/element-container/element-container.component.ts
index 11f5ee7dd..1c86db408 100644
--- a/projects/player/src/app/components/element-container/element-container.component.ts
+++ b/projects/player/src/app/components/element-container/element-container.component.ts
@@ -102,12 +102,11 @@ export class ElementContainerComponent implements OnInit {
this.subscribeForKeyboardEvents(this.elementComponent as TextFieldComponent | TextAreaComponent);
}
- apply(mode: 'mark' | 'delete', color: string): void {
+ applySelectiontoText(mode: 'mark' | 'delete', color: string): void {
TextMarker
.applySelection(
mode,
color,
- (this.elementComponent as TextComponent).textContainerRef.nativeElement,
this.elementComponent as TextComponent
);
this.isMarkingBarOpen = false;
@@ -220,7 +219,7 @@ export class ElementContainerComponent implements OnInit {
(mouseUp.ctrlKey)) {
selection.removeAllRanges();
} else if (this.selectedMode && this.selectedColor) {
- this.apply(this.selectedMode, this.selectedColor);
+ this.applySelectiontoText(this.selectedMode, this.selectedColor);
} else if (!this.isMarkingBarOpen) {
this.openMarkingBar(mouseUp, mouseDown, elementComponent);
}
@@ -259,7 +258,7 @@ export class ElementContainerComponent implements OnInit {
if (selection.active) {
this.selectedColor = selection.color;
this.selectedMode = selection.mode;
- this.apply(selection.mode, selection.color);
+ this.applySelectiontoText(selection.mode, selection.color);
} else {
this.selectedColor = null;
this.selectedMode = null;
--
GitLab