From ec86231c29177a5b877de2311f0372b1d3fe887c Mon Sep 17 00:00:00 2001 From: jojohoch <joachim.hoch@iqb.hu-berlin.de> Date: Fri, 24 Sep 2021 10:15:57 +0200 Subject: [PATCH] [player] Remove not used elementValueChanged subscription --- projects/common/form.service.ts | 11 +---------- .../element-overlay/element-overlay.component.ts | 7 ------- .../app/components/unit-state/unit-state.component.ts | 10 +--------- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/projects/common/form.service.ts b/projects/common/form.service.ts index 9916fdb71..d84d85844 100644 --- a/projects/common/form.service.ts +++ b/projects/common/form.service.ts @@ -1,23 +1,18 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; import { - FormControlElement, FormControlValidators, ChildFormGroup, ValueChangeElement + FormControlElement, FormControlValidators, ChildFormGroup } from './form'; @Injectable({ providedIn: 'root' }) export class FormService { - private _elementValueChanged = new Subject<ValueChangeElement>(); private _controlAdded = new Subject<FormControlElement>(); private _groupAdded = new Subject<ChildFormGroup>(); private _validatorsAdded = new Subject<FormControlValidators>(); private _presentedPageAdded = new Subject<number>(); - get elementValueChanged(): Observable<ValueChangeElement> { - return this._elementValueChanged.asObservable(); - } - get controlAdded(): Observable<FormControlElement> { return this._controlAdded.asObservable(); } @@ -34,10 +29,6 @@ export class FormService { return this._presentedPageAdded.asObservable(); } - changeElementValue(elementValues: ValueChangeElement): void { - this._elementValueChanged.next(elementValues); - } - registerFormControl(control: FormControlElement): void { this._controlAdded.next(control); } diff --git a/projects/player/src/app/components/element-overlay/element-overlay.component.ts b/projects/player/src/app/components/element-overlay/element-overlay.component.ts index 56d8de95f..3c4ec96ac 100644 --- a/projects/player/src/app/components/element-overlay/element-overlay.component.ts +++ b/projects/player/src/app/components/element-overlay/element-overlay.component.ts @@ -8,7 +8,6 @@ import { Subject, Subscription } from 'rxjs'; import { UnitUIElement } from '../../../../../common/unit'; import * as ComponentUtils from '../../../../../common/component-utils'; import { FormService } from '../../../../../common/form.service'; -import { ValueChangeElement } from '../../../../../common/form'; import { SpecialCharacterService } from '../../services/special-character.service'; import { TextFieldComponent } from '../../../../../common/element-components/text-field.component'; import { TextAreaComponent } from '../../../../../common/element-components/text-area.component'; @@ -50,12 +49,6 @@ export class ElementOverlayComponent implements OnInit { if (this.isInputElement) { elementComponent.parentForm = this.parentForm; - elementComponent.formValueChanged - .pipe(takeUntil(this.ngUnsubscribe)) - .subscribe((changeElement: ValueChangeElement) => { - this.formService.changeElementValue(changeElement); - }); - if (this.specialCharacterService.isActive && (this.elementModel.type === 'text-field' || this.elementModel.type === 'text-area')) { this.initEventsForKeyboard(elementComponent); diff --git a/projects/player/src/app/components/unit-state/unit-state.component.ts b/projects/player/src/app/components/unit-state/unit-state.component.ts index ae3f6a953..a4e633e8e 100644 --- a/projects/player/src/app/components/unit-state/unit-state.component.ts +++ b/projects/player/src/app/components/unit-state/unit-state.component.ts @@ -14,7 +14,7 @@ import { VeronaPostService } from '../../services/verona-post.service'; import { MessageService } from '../../../../../common/message.service'; import { MetaDataService } from '../../services/meta-data.service'; import { - FormControlElement, FormControlValidators, ChildFormGroup, ValueChangeElement + FormControlElement, FormControlValidators, ChildFormGroup } from '../../../../../common/form'; import { PlayerConfig, Progress, UnitState, VopNavigationDeniedNotification @@ -60,9 +60,6 @@ export class UnitStateComponent implements OnInit, OnDestroy { this.formService.validatorsAdded .pipe(takeUntil(this.ngUnsubscribe)) .subscribe((validations: FormControlValidators): void => this.setValidators(validations)); - this.formService.elementValueChanged - .pipe(takeUntil(this.ngUnsubscribe)) - .subscribe((value: ValueChangeElement): void => this.onElementValueChanges(value)); this.formService.presentedPageAdded .pipe(takeUntil(this.ngUnsubscribe)) .subscribe((presentedPage: number): void => this.onPresentedPageAdded(presentedPage)); @@ -116,11 +113,6 @@ export class UnitStateComponent implements OnInit, OnDestroy { } }; - private onElementValueChanges = (value: ValueChangeElement): void => { - // eslint-disable-next-line no-console - console.log(`player: onElementValueChanges - ${value.id}: ${value.values[0]} -> ${value.values[1]}`); - }; - private onFormChanges(): void { // eslint-disable-next-line no-console console.log('player: onFormChanges', this.form.value); -- GitLab