From 97a9f91c46a0f2ae443332586d1d45f20ad411f3 Mon Sep 17 00:00:00 2001 From: 4gray Date: Thu, 11 Feb 2021 19:45:11 +0100 Subject: [PATCH] refactor: set videojs based player as default --- package-lock.json | 2 +- .../video-player.component.spec.ts | 42 ++++++++++--------- .../video-player/video-player.component.ts | 2 +- src/app/settings/settings.component.ts | 4 +- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5440ca00..75d2260aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iptvnator", - "version": "0.3.0", + "version": "0.4.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/app/player/components/video-player/video-player.component.spec.ts b/src/app/player/components/video-player/video-player.component.spec.ts index 134e8531a..cb7cccdcb 100644 --- a/src/app/player/components/video-player/video-player.component.spec.ts +++ b/src/app/player/components/video-player/video-player.component.spec.ts @@ -24,24 +24,28 @@ describe('VideoPlayerComponent', () => { let store: ChannelStore; let channels; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ - MockComponent(EpgListComponent), - MockComponent(HtmlVideoPlayerComponent), - MockComponent(VjsPlayerComponent), - MockComponent(VideoPlayerComponent), - MockComponent(ChannelListContainerComponent), - VideoPlayerComponent, - ], - providers: [{ provide: MatSnackBar, useClass: MatSnackBarStub }], - imports: [ - MockModule(MatSidenavModule), - MockModule(MatIconModule), - MockModule(MatToolbarModule), - ], - }).compileComponents(); - })); + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ + MockComponent(EpgListComponent), + MockComponent(HtmlVideoPlayerComponent), + MockComponent(VjsPlayerComponent), + MockComponent(VideoPlayerComponent), + MockComponent(ChannelListContainerComponent), + VideoPlayerComponent, + ], + providers: [ + { provide: MatSnackBar, useClass: MatSnackBarStub }, + ], + imports: [ + MockModule(MatSidenavModule), + MockModule(MatIconModule), + MockModule(MatToolbarModule), + ], + }).compileComponents(); + }) + ); beforeEach(() => { fixture = TestBed.createComponent(VideoPlayerComponent); @@ -63,7 +67,7 @@ describe('VideoPlayerComponent', () => { it('should check default component settings', () => { fixture.detectChanges(); - expect(component.player).toEqual('html5'); + expect(component.player).toEqual('videojs'); }); it('should update store after channel was faved', () => { diff --git a/src/app/player/components/video-player/video-player.component.ts b/src/app/player/components/video-player/video-player.component.ts index c0298aa8f..fd92c1755 100644 --- a/src/app/player/components/video-player/video-player.component.ts +++ b/src/app/player/components/video-player/video-player.component.ts @@ -42,7 +42,7 @@ export class VideoPlayerComponent implements OnInit { ); /** Selected video player component */ - player: VideoPlayerType = 'html5'; + player: VideoPlayerType = 'videojs'; /** Sidebar object */ @ViewChild('sidenav') sideNav: MatSidenav; diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts index e10e0ad6f..beb33b712 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/settings/settings.component.ts @@ -70,7 +70,7 @@ export class SettingsComponent implements OnInit, OnDestroy { private storage: StorageMap ) { this.settingsForm = this.formBuilder.group({ - player: ['html5'], // default value + player: ['videojs'], // default value epgUrl: '', }); @@ -101,7 +101,7 @@ export class SettingsComponent implements OnInit, OnDestroy { this.storage.get('settings').subscribe((settings: Settings) => { if (settings) { this.settingsForm.setValue({ - player: settings.player ? settings.player : 'html5', + player: settings.player ? settings.player : 'videojs', epgUrl: settings.epgUrl ? settings.epgUrl : '', }); }