From af2b6782e8262329f6e02ef586d8546faeea870a Mon Sep 17 00:00:00 2001 From: Araxeus <78568641+Araxeus@users.noreply.github.com> Date: Sat, 11 Mar 2023 14:52:09 +0200 Subject: [PATCH 1/2] bump custom-electron-prompt --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e989a1ddcc..fef4f42fb3 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "butterchurn": "^2.6.7", "butterchurn-presets": "^2.4.7", "chokidar": "^3.5.3", - "custom-electron-prompt": "^1.5.1", + "custom-electron-prompt": "^1.5.4", "custom-electron-titlebar": "^4.1.6", "electron-better-web-request": "^1.0.1", "electron-debug": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index da6c595487..05338cf02f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2425,12 +2425,12 @@ __metadata: languageName: node linkType: hard -"custom-electron-prompt@npm:^1.5.1": - version: 1.5.1 - resolution: "custom-electron-prompt@npm:1.5.1" +"custom-electron-prompt@npm:^1.5.4": + version: 1.5.4 + resolution: "custom-electron-prompt@npm:1.5.4" peerDependencies: electron: ">=10.0.0" - checksum: 43a0d72a7a3471135822cb210d580285f70080d9d3a7b03f82cd4be403059fe20ea05ebdd1f9534928c386ab25a353e678f2cfb3f4ca016b41f3366bff700767 + checksum: 93995b5f0e9d14401a8c4fdd358af32d8b7585b59b111667cfa55f9505109c08914f3140953125b854e5d09e811de8c76c7fec718934c13e8a1ad09fe1b85270 languageName: node linkType: hard @@ -8981,7 +8981,7 @@ __metadata: butterchurn: ^2.6.7 butterchurn-presets: ^2.4.7 chokidar: ^3.5.3 - custom-electron-prompt: ^1.5.1 + custom-electron-prompt: ^1.5.4 custom-electron-titlebar: ^4.1.6 del-cli: ^5.0.0 electron: ^22.0.2 From 108c778f6da37e75d332ad9b54b83392625f668c Mon Sep 17 00:00:00 2001 From: Araxeus <78568641+Araxeus@users.noreply.github.com> Date: Sat, 11 Mar 2023 15:07:41 +0200 Subject: [PATCH 2/2] fix caption selector showing when unavailable --- plugins/captions-selector/front.js | 34 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/plugins/captions-selector/front.js b/plugins/captions-selector/front.js index 6ed83d90ed..bd5203bbdf 100644 --- a/plugins/captions-selector/front.js +++ b/plugins/captions-selector/front.js @@ -11,28 +11,32 @@ module.exports = (options) => { document.addEventListener('apiLoaded', (event) => setup(event, options), { once: true, passive: true }); } -/** - * If captions are disabled by default, - * unload "captions" module when video changes. - */ -const videoChanged = (api, options) => { - if (options.disableCaptions) { - setTimeout(() => api.unloadModule("captions"), 100); - } -} - function setup(event, options) { const api = event.detail; - $("video").addEventListener("srcChanged", () => videoChanged(api, options)); - $(".right-controls-buttons").append(captionsSettingsButton); - captionsSettingsButton.onclick = async () => { - api.loadModule("captions"); + let captionTrackList = api.getOption("captions", "tracklist"); - const captionTrackList = api.getOption("captions", "tracklist"); + $("video").addEventListener("srcChanged", () => { + if (options.disableCaptions) { + setTimeout(() => api.unloadModule("captions"), 100); + captionsSettingsButton.style.display = "none"; + return; + } + api.loadModule("captions"); + + setTimeout(() => { + captionTrackList = api.getOption("captions", "tracklist"); + + captionsSettingsButton.style.display = captionTrackList?.length + ? "inline-block" + : "none"; + }, 250); + }); + + captionsSettingsButton.onclick = async () => { if (captionTrackList?.length) { const currentCaptionTrack = api.getOption("captions", "track"); let currentIndex = !currentCaptionTrack ?