From 4adebd513ec207d54e76a09cd4a8554d1900d34a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 31 Mar 2020 15:43:17 +0200 Subject: Client dependencies upgrade --- .../src/app/shared/images/global-icon.component.ts | 106 ++++++++++----------- .../assets/player/p2p-media-loader/hls-plugin.ts | 6 +- 2 files changed, 57 insertions(+), 55 deletions(-) (limited to 'client/src') diff --git a/client/src/app/shared/images/global-icon.component.ts b/client/src/app/shared/images/global-icon.component.ts index a2e2b719d..a8e5a7020 100644 --- a/client/src/app/shared/images/global-icon.component.ts +++ b/client/src/app/shared/images/global-icon.component.ts @@ -2,59 +2,59 @@ import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit } from '@ import { HooksService } from '@app/core/plugins/hooks.service' const icons = { - 'add': require('!!raw-loader?!../../../assets/images/global/add.svg'), - 'user': require('!!raw-loader?!../../../assets/images/global/user.svg'), - 'sign-out': require('!!raw-loader?!../../../assets/images/global/sign-out.svg'), - 'syndication': require('!!raw-loader?!../../../assets/images/global/syndication.svg'), - 'help': require('!!raw-loader?!../../../assets/images/global/help.svg'), - 'sparkle': require('!!raw-loader?!../../../assets/images/global/sparkle.svg'), - 'alert': require('!!raw-loader?!../../../assets/images/global/alert.svg'), - 'cloud-error': require('!!raw-loader?!../../../assets/images/global/cloud-error.svg'), - 'clock': require('!!raw-loader?!../../../assets/images/global/clock.svg'), - 'user-add': require('!!raw-loader?!../../../assets/images/global/user-add.svg'), - 'no': require('!!raw-loader?!../../../assets/images/global/no.svg'), - 'cloud-download': require('!!raw-loader?!../../../assets/images/global/cloud-download.svg'), - 'undo': require('!!raw-loader?!../../../assets/images/global/undo.svg'), - 'history': require('!!raw-loader?!../../../assets/images/global/history.svg'), - 'circle-tick': require('!!raw-loader?!../../../assets/images/global/circle-tick.svg'), - 'cog': require('!!raw-loader?!../../../assets/images/global/cog.svg'), - 'download': require('!!raw-loader?!../../../assets/images/global/download.svg'), - 'go': require('!!raw-loader?!../../../assets/images/menu/go.svg'), - 'edit': require('!!raw-loader?!../../../assets/images/global/edit.svg'), - 'im-with-her': require('!!raw-loader?!../../../assets/images/global/im-with-her.svg'), - 'delete': require('!!raw-loader?!../../../assets/images/global/delete.svg'), - 'server': require('!!raw-loader?!../../../assets/images/global/server.svg'), - 'cross': require('!!raw-loader?!../../../assets/images/global/cross.svg'), - 'validate': require('!!raw-loader?!../../../assets/images/global/validate.svg'), - 'tick': require('!!raw-loader?!../../../assets/images/global/tick.svg'), - 'repeat': require('!!raw-loader?!../../../assets/images/global/repeat.svg'), - 'inbox-full': require('!!raw-loader?!../../../assets/images/global/inbox-full.svg'), - 'dislike': require('!!raw-loader?!../../../assets/images/video/dislike.svg'), - 'support': require('!!raw-loader?!../../../assets/images/video/support.svg'), - 'like': require('!!raw-loader?!../../../assets/images/video/like.svg'), - 'more-horizontal': require('!!raw-loader?!../../../assets/images/global/more-horizontal.svg'), - 'more-vertical': require('!!raw-loader?!../../../assets/images/global/more-vertical.svg'), - 'share': require('!!raw-loader?!../../../assets/images/video/share.svg'), - 'upload': require('!!raw-loader?!../../../assets/images/video/upload.svg'), - 'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg'), - 'play': require('!!raw-loader?!../../../assets/images/global/play.svg'), - 'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg'), - 'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg'), - 'home': require('!!raw-loader?!../../../assets/images/menu/home.svg'), - 'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg'), - 'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg'), - 'video-lang': require('!!raw-loader?!../../../assets/images/global/video-lang.svg'), - 'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg'), - 'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg'), - 'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg'), - 'language': require('!!raw-loader?!../../../assets/images/menu/language.svg'), - 'unsensitive': require('!!raw-loader?!../../../assets/images/menu/eye.svg'), - 'sensitive': require('!!raw-loader?!../../../assets/images/menu/eye-closed.svg'), - 'p2p': require('!!raw-loader?!../../../assets/images/menu/p2p.svg'), - 'users': require('!!raw-loader?!../../../assets/images/global/users.svg'), - 'search': require('!!raw-loader?!../../../assets/images/global/search.svg'), - 'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg'), - 'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg') + 'add': require('!!raw-loader?!../../../assets/images/global/add.svg').default, + 'user': require('!!raw-loader?!../../../assets/images/global/user.svg').default, + 'sign-out': require('!!raw-loader?!../../../assets/images/global/sign-out.svg').default, + 'syndication': require('!!raw-loader?!../../../assets/images/global/syndication.svg').default, + 'help': require('!!raw-loader?!../../../assets/images/global/help.svg').default, + 'sparkle': require('!!raw-loader?!../../../assets/images/global/sparkle.svg').default, + 'alert': require('!!raw-loader?!../../../assets/images/global/alert.svg').default, + 'cloud-error': require('!!raw-loader?!../../../assets/images/global/cloud-error.svg').default, + 'clock': require('!!raw-loader?!../../../assets/images/global/clock.svg').default, + 'user-add': require('!!raw-loader?!../../../assets/images/global/user-add.svg').default, + 'no': require('!!raw-loader?!../../../assets/images/global/no.svg').default, + 'cloud-download': require('!!raw-loader?!../../../assets/images/global/cloud-download.svg').default, + 'undo': require('!!raw-loader?!../../../assets/images/global/undo.svg').default, + 'history': require('!!raw-loader?!../../../assets/images/global/history.svg').default, + 'circle-tick': require('!!raw-loader?!../../../assets/images/global/circle-tick.svg').default, + 'cog': require('!!raw-loader?!../../../assets/images/global/cog.svg').default, + 'download': require('!!raw-loader?!../../../assets/images/global/download.svg').default, + 'go': require('!!raw-loader?!../../../assets/images/menu/go.svg').default, + 'edit': require('!!raw-loader?!../../../assets/images/global/edit.svg').default, + 'im-with-her': require('!!raw-loader?!../../../assets/images/global/im-with-her.svg').default, + 'delete': require('!!raw-loader?!../../../assets/images/global/delete.svg').default, + 'server': require('!!raw-loader?!../../../assets/images/global/server.svg').default, + 'cross': require('!!raw-loader?!../../../assets/images/global/cross.svg').default, + 'validate': require('!!raw-loader?!../../../assets/images/global/validate.svg').default, + 'tick': require('!!raw-loader?!../../../assets/images/global/tick.svg').default, + 'repeat': require('!!raw-loader?!../../../assets/images/global/repeat.svg').default, + 'inbox-full': require('!!raw-loader?!../../../assets/images/global/inbox-full.svg').default, + 'dislike': require('!!raw-loader?!../../../assets/images/video/dislike.svg').default, + 'support': require('!!raw-loader?!../../../assets/images/video/support.svg').default, + 'like': require('!!raw-loader?!../../../assets/images/video/like.svg').default, + 'more-horizontal': require('!!raw-loader?!../../../assets/images/global/more-horizontal.svg').default, + 'more-vertical': require('!!raw-loader?!../../../assets/images/global/more-vertical.svg').default, + 'share': require('!!raw-loader?!../../../assets/images/video/share.svg').default, + 'upload': require('!!raw-loader?!../../../assets/images/video/upload.svg').default, + 'playlist-add': require('!!raw-loader?!../../../assets/images/video/playlist-add.svg').default, + 'play': require('!!raw-loader?!../../../assets/images/global/play.svg').default, + 'playlists': require('!!raw-loader?!../../../assets/images/global/playlists.svg').default, + 'globe': require('!!raw-loader?!../../../assets/images/menu/globe.svg').default, + 'home': require('!!raw-loader?!../../../assets/images/menu/home.svg').default, + 'recently-added': require('!!raw-loader?!../../../assets/images/menu/recently-added.svg').default, + 'trending': require('!!raw-loader?!../../../assets/images/menu/trending.svg').default, + 'video-lang': require('!!raw-loader?!../../../assets/images/global/video-lang.svg').default, + 'videos': require('!!raw-loader?!../../../assets/images/global/videos.svg').default, + 'folder': require('!!raw-loader?!../../../assets/images/global/folder.svg').default, + 'subscriptions': require('!!raw-loader?!../../../assets/images/menu/subscriptions.svg').default, + 'language': require('!!raw-loader?!../../../assets/images/menu/language.svg').default, + 'unsensitive': require('!!raw-loader?!../../../assets/images/menu/eye.svg').default, + 'sensitive': require('!!raw-loader?!../../../assets/images/menu/eye-closed.svg').default, + 'p2p': require('!!raw-loader?!../../../assets/images/menu/p2p.svg').default, + 'users': require('!!raw-loader?!../../../assets/images/global/users.svg').default, + 'search': require('!!raw-loader?!../../../assets/images/global/search.svg').default, + 'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg').default, + 'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg').default } export type GlobalIconName = keyof typeof icons diff --git a/client/src/assets/player/p2p-media-loader/hls-plugin.ts b/client/src/assets/player/p2p-media-loader/hls-plugin.ts index d78e1ab90..5bfa39cfa 100644 --- a/client/src/assets/player/p2p-media-loader/hls-plugin.ts +++ b/client/src/assets/player/p2p-media-loader/hls-plugin.ts @@ -13,6 +13,8 @@ type Metadata = { levels: Hlsjs.Level[] } +type CustomAudioTrack = AudioTrack & { name?: string, lang?: string } + const registerSourceHandler = function (vjs: typeof videojs) { if (!Hlsjs.isSupported()) { console.warn('Hls.js is not supported in this browser!') @@ -91,7 +93,7 @@ class Html5Hlsjs { private readonly source: videojs.Tech.SourceObject private readonly vjs: typeof videojs - private hls: Hlsjs & { manualLevel?: number } // FIXME: typings + private hls: Hlsjs & { manualLevel?: number, audioTrack?: any, audioTracks?: CustomAudioTrack[] } // FIXME: typings private hlsjsConfig: Partial = null private _duration: number = null @@ -393,7 +395,7 @@ class Html5Hlsjs { } private _onAudioTracks () { - const hlsAudioTracks = this.hls.audioTracks as (AudioTrack & { name?: string, lang?: string })[] // FIXME typings + const hlsAudioTracks = this.hls.audioTracks const playerAudioTracks = this.tech.audioTracks() if (hlsAudioTracks.length > 1 && playerAudioTracks.length === 0) { -- cgit v1.2.3