diff --git a/package-lock.json b/package-lock.json index 132520ab0d..73e48d813b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,14 +25,14 @@ "dompurify": "3.0.1", "epubjs": "0.4.2", "escape-html": "1.0.3", - "event-target-polyfill": "0.0.3", + "event-target-polyfill": "github:ThaUnknown/event-target-polyfill", "fast-text-encoding": "1.0.6", "flv.js": "1.6.2", "headroom.js": "0.12.0", "history": "5.3.0", "hls.js": "1.3.4", "intersection-observer": "0.12.2", - "jassub": "1.5.4", + "jassub": "1.5.5", "jellyfin-apiclient": "1.10.0", "jquery": "3.6.3", "jstree": "3.3.15", @@ -7296,8 +7296,8 @@ }, "node_modules/event-target-polyfill": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/event-target-polyfill/-/event-target-polyfill-0.0.3.tgz", - "integrity": "sha512-ZMc6UuvmbinrCk4RzGyVmRyIsAyxMRlp4CqSrcQRO8Dy0A9ldbiRy5kdtBj4OtP7EClGdqGfIqo9JmOClMsGLQ==" + "resolved": "git+ssh://git@github.com/ThaUnknown/event-target-polyfill.git#5152219bdee9bc18ab0a1cccddab48a813c20b81", + "license": "MIT" }, "node_modules/eventemitter3": { "version": "4.0.7", @@ -9653,9 +9653,9 @@ } }, "node_modules/jassub": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/jassub/-/jassub-1.5.4.tgz", - "integrity": "sha512-pSuEwSoQ2pjrfVhMJ+iNb7WcwrzzKNU+Q0VWptkeWPJx7abeNxPMS3zX0c6bpMyGLYaTh5Uc6MePEFni4tDv6A==", + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/jassub/-/jassub-1.5.5.tgz", + "integrity": "sha512-PduISAKqGZYMRnaO7v9HKYaR2/q8U6tTQK2hKSJtUGucWcAM1kS4Rsqwf7qbtB++UmfQYxuG1fN4VixfiA2iOA==", "dependencies": { "rvfc-polyfill": "^1.0.4" } @@ -24491,9 +24491,8 @@ } }, "event-target-polyfill": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/event-target-polyfill/-/event-target-polyfill-0.0.3.tgz", - "integrity": "sha512-ZMc6UuvmbinrCk4RzGyVmRyIsAyxMRlp4CqSrcQRO8Dy0A9ldbiRy5kdtBj4OtP7EClGdqGfIqo9JmOClMsGLQ==" + "version": "git+ssh://git@github.com/ThaUnknown/event-target-polyfill.git#5152219bdee9bc18ab0a1cccddab48a813c20b81", + "from": "event-target-polyfill@github:ThaUnknown/event-target-polyfill" }, "eventemitter3": { "version": "4.0.7", @@ -26246,9 +26245,9 @@ "dev": true }, "jassub": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/jassub/-/jassub-1.5.4.tgz", - "integrity": "sha512-pSuEwSoQ2pjrfVhMJ+iNb7WcwrzzKNU+Q0VWptkeWPJx7abeNxPMS3zX0c6bpMyGLYaTh5Uc6MePEFni4tDv6A==", + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/jassub/-/jassub-1.5.5.tgz", + "integrity": "sha512-PduISAKqGZYMRnaO7v9HKYaR2/q8U6tTQK2hKSJtUGucWcAM1kS4Rsqwf7qbtB++UmfQYxuG1fN4VixfiA2iOA==", "requires": { "rvfc-polyfill": "^1.0.4" } diff --git a/package.json b/package.json index a7da1b1b40..c7f30f6a84 100644 --- a/package.json +++ b/package.json @@ -84,14 +84,14 @@ "dompurify": "3.0.1", "epubjs": "0.4.2", "escape-html": "1.0.3", - "event-target-polyfill": "0.0.3", + "event-target-polyfill": "github:ThaUnknown/event-target-polyfill", "fast-text-encoding": "1.0.6", "flv.js": "1.6.2", "headroom.js": "0.12.0", "history": "5.3.0", "hls.js": "1.3.4", "intersection-observer": "0.12.2", - "jassub": "1.5.4", + "jassub": "1.5.5", "jellyfin-apiclient": "1.10.0", "jquery": "3.6.3", "jstree": "3.3.15", diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js index 80d8c66cb0..ab38df6d5d 100644 --- a/src/plugins/htmlVideoPlayer/plugin.js +++ b/src/plugins/htmlVideoPlayer/plugin.js @@ -1269,12 +1269,12 @@ function tryRemoveElement(elem) { subUrl: getTextTrackUrl(track, item), fonts: avaliableFonts, fallbackFont: 'liberation sans', - availableFonts: {'liberation sans': `${appRouter.baseUrl()}/libraries/default.woff2`}, + availableFonts: {'liberation sans': `${appRouter.baseUrl()}/default.woff2`}, // Disabled eslint compat, but is safe as corejs3 polyfills URL // eslint-disable-next-line compat/compat - workerUrl: `${appRouter.baseUrl()}${new URL('jassub/dist/jassub-worker.js', import.meta.url).pathname}`, + workerUrl: new URL('jassub/dist/jassub-worker.js', import.meta.url), // eslint-disable-next-line compat/compat - legacyWorkerUrl: `${appRouter.baseUrl()}${new URL('jassub/dist/jassub-worker-legacy.js', import.meta.url).pathname}`, + legacyWorkerUrl: new URL('jassub/dist/jassub-worker-legacy.js', import.meta.url), timeOffset: (this._currentPlayOptions.transcodingOffsetTicks || 0) / 10000000, // new jassub options; override all, even defaults blendMode: 'js', @@ -1291,6 +1291,7 @@ function tryRemoveElement(elem) { prescaleHeightLimit: 1080, maxRenderHeight: 2160 }; + // TODO: replace with `event-target-polyfill` once https://github.com/benlesh/event-target-polyfill/pull/12 or 11 is merged import('event-target-polyfill').then(() => { import('jassub').then(({ default: JASSUB }) => { Promise.all([