Skip to content

Commit 57c4b3e

Browse files
committed
feedbacks
1 parent 4355851 commit 57c4b3e

2 files changed

Lines changed: 23 additions & 17 deletions

File tree

projects/sunbird-video-player/src/lib/sunbird-video-player.component.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('SunbirdVideoPlayerComponent', () => {
3232
jasmine.clock().install();
3333
});
3434

35-
afterEach(function() {
35+
afterEach(function () {
3636
jasmine.clock().uninstall();
3737
});
3838
it('should create SunbirdVideoPlayerComponent', () => {
@@ -57,7 +57,9 @@ describe('SunbirdVideoPlayerComponent', () => {
5757
const event = {};
5858
spyOn(component.playerEvent, 'emit').and.callThrough();
5959
spyOn(component.viewerService, 'raiseHeartBeatEvent').and.callFake(() => 'true');
60+
spyOn(component.viewerService, 'raiseEndEvent');
6061
component.exitContent(event);
62+
expect(component.viewerService.raiseEndEvent).toHaveBeenCalled();
6163
expect(component.playerEvent.emit).toHaveBeenCalledWith({});
6264
expect(component.viewerService.raiseHeartBeatEvent).toHaveBeenCalledWith('EXIT');
6365
});

projects/sunbird-video-player/src/lib/sunbird-video-player.component.ts

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, OnChanges, SimpleChanges,
33
HostListener, ElementRef, ViewChild, AfterViewInit, Renderer2, OnDestroy
44
} from '@angular/core';
5-
import { ErrorService , errorCode , errorMessage, ISideBarEvent } from '@project-sunbird/sunbird-player-sdk-v9';
5+
import { ErrorService, errorCode, errorMessage, ISideBarEvent } from '@project-sunbird/sunbird-player-sdk-v9';
66

77
import { PlayerConfig } from './playerInterfaces';
88
import { IAction } from './playerInterfaces';
@@ -74,8 +74,8 @@ export class SunbirdVideoPlayerComponent implements OnInit, AfterViewInit, OnDes
7474
let code = errorCode.contentLoadFails,
7575
message = errorMessage.contentLoadFails;
7676
if (this.viewerService.isAvailableLocally) {
77-
code = errorCode.contentLoadFails;
78-
message = errorMessage.contentLoadFails;
77+
code = errorCode.contentLoadFails;
78+
message = errorMessage.contentLoadFails;
7979
}
8080
if (code === errorCode.contentLoadFails) {
8181
this.showContentError = true;
@@ -102,14 +102,14 @@ export class SunbirdVideoPlayerComponent implements OnInit, AfterViewInit, OnDes
102102
ngOnInit() {
103103
this.isInitialized = true;
104104
if (this.playerConfig) {
105-
if (typeof this.playerConfig === 'string') {
106-
try {
107-
this.playerConfig = JSON.parse(this.playerConfig);
108-
} catch (error) {
109-
console.error('Invalid playerConfig: ', error);
105+
if (typeof this.playerConfig === 'string') {
106+
try {
107+
this.playerConfig = JSON.parse(this.playerConfig);
108+
} catch (error) {
109+
console.error('Invalid playerConfig: ', error);
110+
}
110111
}
111112
}
112-
}
113113
setInterval(() => {
114114
if (!this.isPaused) {
115115
this.showControls = false;
@@ -122,7 +122,7 @@ export class SunbirdVideoPlayerComponent implements OnInit, AfterViewInit, OnDes
122122
this.sideMenuConfig = { ...this.sideMenuConfig, ...this.playerConfig.config.sideMenu };
123123
this.videoPlayerService.initialize(this.playerConfig);
124124
this.viewerService.initialize(this.playerConfig);
125-
window.addEventListener('offline', this.raiseInternetDisconnectionError , true);
125+
window.addEventListener('offline', this.raiseInternetDisconnectionError, true);
126126
this.QumlPlayerConfig.config = this.playerConfig.config;
127127
this.QumlPlayerConfig.config.sideMenu.enable = false;
128128
this.QumlPlayerConfig.context = this.playerConfig.context;
@@ -191,7 +191,7 @@ export class SunbirdVideoPlayerComponent implements OnInit, AfterViewInit, OnDes
191191
this.QumlPlayerConfig.context.objectRollup = {};
192192
}
193193
const levels = Object.keys(this.QumlPlayerConfig.context.objectRollup);
194-
this.QumlPlayerConfig.context.objectRollup[`l${levels.length + 1}`] = id;
194+
this.QumlPlayerConfig.context.objectRollup[`l${levels.length + 1}`] = id;
195195
}
196196
}
197197

@@ -208,7 +208,11 @@ export class SunbirdVideoPlayerComponent implements OnInit, AfterViewInit, OnDes
208208
}
209209

210210
exitContent(event) {
211-
this.viewerService.raiseEndEvent(true);
211+
try {
212+
this.viewerService.raiseEndEvent(true);
213+
} catch (error) {
214+
console.error('Error while raising end event: ', error);
215+
}
212216
this.playerEvent.emit(event);
213217
this.viewerService.raiseHeartBeatEvent('EXIT');
214218
}
@@ -243,13 +247,13 @@ export class SunbirdVideoPlayerComponent implements OnInit, AfterViewInit, OnDes
243247
if (!document.fullscreenElement && this.isFullScreen) {
244248
if (document.getElementsByClassName('video-js')[0]) {
245249
document.getElementsByClassName('video-js')[0].requestFullscreen()
246-
.catch((err) => console.error(err));
250+
.catch((err) => console.error(err));
247251
}
248252
}
249253
}
250254
}
251255

252-
questionSetData({response, time, identifier}) {
256+
questionSetData({ response, time, identifier }) {
253257
this.QumlPlayerConfig.metadata = response;
254258
this.QumlPlayerConfig.metadata['showStartPage'] = 'No';
255259
this.QumlPlayerConfig.metadata['showEndPage'] = 'No';
@@ -258,7 +262,7 @@ export class SunbirdVideoPlayerComponent implements OnInit, AfterViewInit, OnDes
258262
if (document.fullscreenElement) {
259263
this.isFullScreen = true;
260264
document.exitFullscreen()
261-
.catch((err) => console.error(err));
265+
.catch((err) => console.error(err));
262266
} else {
263267
this.isFullScreen = false;
264268
}
@@ -281,6 +285,6 @@ export class SunbirdVideoPlayerComponent implements OnInit, AfterViewInit, OnDes
281285
this.unlistenTouchStart();
282286
this.unlistenMouseMove();
283287
this.viewerService.isEndEventRaised = false;
284-
window.removeEventListener('offline', this.raiseInternetDisconnectionError , true);
288+
window.removeEventListener('offline', this.raiseInternetDisconnectionError, true);
285289
}
286290
}

0 commit comments

Comments
 (0)