From a72dd37ef00f6867d96927e7a35dd8619469604d Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Tue, 22 Oct 2024 15:41:24 -0400 Subject: [PATCH 1/5] Hide favorite button from osd on small screens --- src/styles/videoosd.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/videoosd.scss b/src/styles/videoosd.scss index b7f06c08db..9732a11517 100644 --- a/src/styles/videoosd.scss +++ b/src/styles/videoosd.scss @@ -183,6 +183,7 @@ } @media all and (max-width: 30em) { + .btnUserRating, .osdMediaInfo, .osdPoster { display: none !important; From 29309bc4b898eb2fa2f62aa7ef424f6549bccb1e Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Tue, 22 Oct 2024 15:43:15 -0400 Subject: [PATCH 2/5] Unhide next/prev track buttons if playlist has more items --- src/controllers/playback/video/index.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index 779b68f9f6..577d168535 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -887,12 +887,17 @@ export default function (view) { } function updatePlaylist() { - const btnPreviousTrack = view.querySelector('.btnPreviousTrack'); - const btnNextTrack = view.querySelector('.btnNextTrack'); - btnPreviousTrack.classList.remove('hide'); - btnNextTrack.classList.remove('hide'); - btnNextTrack.disabled = false; - btnPreviousTrack.disabled = false; + playbackManager.getPlaylist() + .then(playlist => { + if (playlist && playlist.length > 1) { + const btnPreviousTrack = view.querySelector('.btnPreviousTrack'); + const btnNextTrack = view.querySelector('.btnNextTrack'); + btnPreviousTrack.classList.remove('hide'); + btnNextTrack.classList.remove('hide'); + btnNextTrack.disabled = false; + btnPreviousTrack.disabled = false; + } + }); } function updateTimeText(elem, ticks, divider) { From f2b8c5e489566041b706c4097b2dc1a56afabc6d Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Tue, 22 Oct 2024 16:08:25 -0400 Subject: [PATCH 3/5] Fix order for 1hitsong OCD --- src/controllers/playback/video/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index 577d168535..4069fc43b5 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -891,11 +891,11 @@ export default function (view) { .then(playlist => { if (playlist && playlist.length > 1) { const btnPreviousTrack = view.querySelector('.btnPreviousTrack'); - const btnNextTrack = view.querySelector('.btnNextTrack'); btnPreviousTrack.classList.remove('hide'); + btnPreviousTrack.disabled = false; + const btnNextTrack = view.querySelector('.btnNextTrack'); btnNextTrack.classList.remove('hide'); btnNextTrack.disabled = false; - btnPreviousTrack.disabled = false; } }); } From a2e0f522974bbafa58ddb905c604b12fc53365ac Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Tue, 22 Oct 2024 16:22:50 -0400 Subject: [PATCH 4/5] Fix for niels OCD --- src/controllers/playback/video/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index 4069fc43b5..3959a166b5 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -891,10 +891,10 @@ export default function (view) { .then(playlist => { if (playlist && playlist.length > 1) { const btnPreviousTrack = view.querySelector('.btnPreviousTrack'); - btnPreviousTrack.classList.remove('hide'); - btnPreviousTrack.disabled = false; const btnNextTrack = view.querySelector('.btnNextTrack'); + btnPreviousTrack.classList.remove('hide'); btnNextTrack.classList.remove('hide'); + btnPreviousTrack.disabled = false; btnNextTrack.disabled = false; } }); From 865046e668ceb38113241923590c012a03dea094 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Tue, 22 Oct 2024 16:34:25 -0400 Subject: [PATCH 5/5] Use async/await when getting playlist --- src/controllers/playback/video/index.js | 27 ++++++++++++++----------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index 3959a166b5..a662e905a0 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -886,18 +886,21 @@ export default function (view) { } } - function updatePlaylist() { - playbackManager.getPlaylist() - .then(playlist => { - if (playlist && playlist.length > 1) { - const btnPreviousTrack = view.querySelector('.btnPreviousTrack'); - const btnNextTrack = view.querySelector('.btnNextTrack'); - btnPreviousTrack.classList.remove('hide'); - btnNextTrack.classList.remove('hide'); - btnPreviousTrack.disabled = false; - btnNextTrack.disabled = false; - } - }); + async function updatePlaylist() { + try { + const playlist = await playbackManager.getPlaylist(); + + if (playlist && playlist.length > 1) { + const btnPreviousTrack = view.querySelector('.btnPreviousTrack'); + const btnNextTrack = view.querySelector('.btnNextTrack'); + btnPreviousTrack.classList.remove('hide'); + btnNextTrack.classList.remove('hide'); + btnPreviousTrack.disabled = false; + btnNextTrack.disabled = false; + } + } catch (err) { + console.error('[VideoPlayer] failed to get playlist', err); + } } function updateTimeText(elem, ticks, divider) {