From 6e82521e668f874a1094f09773e07b35a228c718 Mon Sep 17 00:00:00 2001 From: jojohoch <joachim.hoch@iqb.hu-berlin.de> Date: Wed, 17 Aug 2022 10:23:11 +0200 Subject: [PATCH] [player] Rename property of UnitStateService --- .../player/src/app/directives/unit-state.directive.ts | 2 +- .../player/src/app/services/unit-state.service.spec.ts | 4 ++-- projects/player/src/app/services/unit-state.service.ts | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/player/src/app/directives/unit-state.directive.ts b/projects/player/src/app/directives/unit-state.directive.ts index 4fd54a1ba..666802c93 100644 --- a/projects/player/src/app/directives/unit-state.directive.ts +++ b/projects/player/src/app/directives/unit-state.directive.ts @@ -26,7 +26,7 @@ export class UnitStateDirective implements OnInit, OnDestroy { ngOnInit(): void { merge( this.mediaPlayerService.mediaStatusChanged, - this.unitStateService.presentedPageAdded, + this.unitStateService.pagePresented, this.unitStateService.elementCodeChanged ) .pipe( diff --git a/projects/player/src/app/services/unit-state.service.spec.ts b/projects/player/src/app/services/unit-state.service.spec.ts index e450b8686..863b6dbdf 100644 --- a/projects/player/src/app/services/unit-state.service.spec.ts +++ b/projects/player/src/app/services/unit-state.service.spec.ts @@ -107,7 +107,7 @@ describe('UnitStateService', () => { service.elementCodes = []; const element = document.createElement('div'); service.registerElement('element_1', 'TEST1', element, 1); - service.presentedPageAdded + service.pagePresented .subscribe(index => { expect(index).toEqual(1); done(); @@ -119,7 +119,7 @@ describe('UnitStateService', () => { service.elementCodes = []; const element = document.createElement('div'); service.registerElement('element_1', 'TEST1', element, 1); - service.presentedPageAdded + service.pagePresented .subscribe(index => { expect(index).toEqual(1); done(); diff --git a/projects/player/src/app/services/unit-state.service.ts b/projects/player/src/app/services/unit-state.service.ts index c2e36c170..33c7db353 100644 --- a/projects/player/src/app/services/unit-state.service.ts +++ b/projects/player/src/app/services/unit-state.service.ts @@ -13,7 +13,7 @@ import { IntersectionDetector } from '../classes/intersection-detector'; }) export class UnitStateService { private _elementCodes: ElementCode[] = []; - private _presentedPageAdded = new Subject<number>(); + private _pagePresented = new Subject<number>(); private _elementCodeChanged = new Subject<ElementCode>(); private presentedPages: number[] = []; private elementIdPageIndexMap: { [elementId: string]: number } = {}; @@ -40,8 +40,8 @@ export class UnitStateService { return this._elementCodeChanged.asObservable(); } - get presentedPageAdded(): Observable<number> { - return this._presentedPageAdded.asObservable(); + get pagePresented(): Observable<number> { + return this._pagePresented.asObservable(); } get presentedPagesProgress(): Progress { @@ -132,7 +132,7 @@ export class UnitStateService { ElementCodeStatusValue.DISPLAYED); if (notDisplayedElements.length === 0) { this.presentedPages.push(pageIndex); - this._presentedPageAdded.next(pageIndex); + this._pagePresented.next(pageIndex); } } else { LogService.warn(`player: page ${pageIndex} is already presented`); -- GitLab