Merge remote-tracking branch 'weblate/develop' into develop

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 37242befe1ba249448208e5bc33e4feb7e75d441..672a85d0b0525bfd1d54bf9ed0982d8ca81f6610 100644 (file)
--- a/client/src/assets/player/p2p-media-loader/hls-plugin.ts
+++ b/client/src/assets/player/p2p-media-loader/hls-plugin.ts
@@ -102,9 +102,8 @@ class Html5Hlsjs {
   private dvrDuration: number = null
   private edgeMargin: number = null
 
-  private handlers: { [ id in 'play' | 'addtrack' | 'playing' | 'textTracksChange' | 'audioTracksChange' ]: EventListener } = {
+  private handlers: { [ id in 'play' | 'playing' | 'textTracksChange' | 'audioTracksChange' ]: EventListener } = {
     play: null,
-    addtrack: null,
     playing: null,
     textTracksChange: null,
     audioTracksChange: null
@@ -177,7 +176,6 @@ class Html5Hlsjs {
   // See comment for `initialize` method.
   dispose () {
     this.videoElement.removeEventListener('play', this.handlers.play)
-    this.videoElement.textTracks.removeEventListener('addtrack', this.handlers.addtrack)
     this.videoElement.removeEventListener('playing', this.handlers.playing)
 
     this.player.textTracks().removeEventListener('change', this.handlers.textTracksChange)
@@ -622,9 +620,6 @@ class Html5Hlsjs {
 
     this.hls.attachMedia(this.videoElement)
 
-    this.handlers.addtrack = this._updateTextTrackList.bind(this)
-    this.videoElement.textTracks.addEventListener('addtrack', this.handlers.addtrack)
-
     this.hls.loadSource(this.source.src)
   }
 

diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index e4fb4fd91c5fc9a5892598026bf6ed0da3c44207..54e5f421b73db74b38668fe3ac0b556717c5d93b 100755 (executable)
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -30,7 +30,7 @@ async function run () {
     console.log(' * [Marie-Cécile Godwin Paccard](https://mcgodwin.com/)')
 
     console.log('\n\n# Icons\n')
-    console.log(' * [Feather Icons](feathericons.com/) (MIT)')
+    console.log(' * [Feather Icons](https://feathericons.com) (MIT)')
     console.log(' * `playlist add`, `history`, `subscriptions`, `miscellaneous-services.svg` by Material UI (Apache 2.0)')
     console.log(' * `support` by Chocobozzz (CC-BY)')
     console.log(' * `language` by Aaron Jin (CC-BY)')