diff options
Diffstat (limited to 'web/js')
| -rw-r--r-- | web/js/app.js | 3 | ||||
| -rw-r--r-- | web/js/keyboard.js | 6 | ||||
| -rw-r--r-- | web/js/player.js | 31 |
3 files changed, 35 insertions, 5 deletions
diff --git a/web/js/app.js b/web/js/app.js index a0e8893..b2e79e9 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -1,7 +1,7 @@ import { API } from './api.js'; import { initKeyboard } from './keyboard.js'; import { initSelection, select, selectByElement, next, prev, currentIndex, currentElement, navUp, navDown, navLeft, navRight } from './selection.js'; -import { initPlayer, togglePlay, toggleFullscreen, toggleStage, toggleDetach, exitFullscreenIfNeeded, currentMediaId, selectAndPlay, playPrevious, playNext } from './player.js'; +import { initPlayer, togglePlay, toggleFullscreen, toggleStage, toggleMinimize, toggleDetach, exitFullscreenIfNeeded, currentMediaId, selectAndPlay, playPrevious, playNext } from './player.js'; import { initSearch, focusSearch, trigger as triggerSearch } from './search.js'; import { initShuffle, toggle as toggleShuffle, isOn as isShuffle } from './shuffle.js'; import { initThemes } from './themes.js'; @@ -109,6 +109,7 @@ async function initApp() { playPause: () => togglePlay(), fullscreen: () => toggleFullscreen(), toggleStage: () => toggleStage(), + toggleMinimize: () => toggleMinimize(), escape: () => { exitFullscreenIfNeeded(); const el = currentElement(); if (el) el.classList.remove('selected'); closeAllModals(); }, shuffle: () => { toggleShuffle(); loadMedia(); }, share: () => shareSelected(), diff --git a/web/js/keyboard.js b/web/js/keyboard.js index a293d3f..db0d4db 100644 --- a/web/js/keyboard.js +++ b/web/js/keyboard.js @@ -101,10 +101,8 @@ export function initKeyboard(handlers) { break; case 'Enter': handlers.enter?.(e); break; case 'p': handlers.playPause?.(e); break; - case 'c': - case 'C': - handlers.toggleStage?.(e); - break; + case 'c': handlers.toggleStage?.(e); break; + case 'C': handlers.toggleMinimize?.(e); break; case 'f': handlers.fullscreen?.(e); break; case 'Escape': handlers.escape?.(e); break; case 'Backspace': handlers.backspace?.(e); break; diff --git a/web/js/player.js b/web/js/player.js index 253548c..46e6246 100644 --- a/web/js/player.js +++ b/web/js/player.js @@ -21,6 +21,9 @@ const els = () => ({ btnMute: document.getElementById('btn-mute'), btnFs: document.getElementById('btn-fullscreen'), btnToggleStage: document.getElementById('btn-toggle-stage'), + btnMinimize: document.getElementById('btn-minimize'), + btnRestore: document.getElementById('btn-restore-player'), + restoreTitle: document.getElementById('player-restore-title'), bigPlay: document.getElementById('big-play'), coverArt: document.getElementById('cover-art'), track: document.getElementById('progress-track'), @@ -42,6 +45,8 @@ export function initPlayer() { e.btnMute?.addEventListener('click', toggleMute); e.btnFs?.addEventListener('click', toggleFullscreen); e.btnToggleStage?.addEventListener('click', toggleStage); + e.btnMinimize?.addEventListener('click', minimizePlayer); + e.btnRestore?.addEventListener('click', toggleMinimize); e.bigPlay?.addEventListener('click', togglePlay); e.bigPlay?.addEventListener('keydown', (ev) => { if (ev.key === 'Enter' || ev.key === ' ') { ev.preventDefault(); togglePlay(); } }); @@ -251,6 +256,7 @@ export function loadMediaDirect(media, streamUrl, thumbnailUrl, resumeFrom = 0) e.buffered && (e.buffered.style.background = 'transparent'); e.fill.style.width = '0%'; e.thumb.style.left = '0%'; + updateMinimizedTitle(); updateCollapsedSize(); } @@ -292,6 +298,7 @@ function loadMedia(media, resumeFrom = 0) { e.buffered && (e.buffered.style.background = 'transparent'); e.fill.style.width = '0%'; e.thumb.style.left = '0%'; + updateMinimizedTitle(); updateCollapsedSize(); } @@ -349,10 +356,34 @@ export function toggleFullscreen() { export function toggleStage() { const e = els(); + e.player?.classList.remove('minimized'); e.player?.classList.toggle('collapsed'); console.log('toggleStage: collapsed =', e.player?.classList.contains('collapsed')); } +export function toggleMinimize() { + const e = els(); + if (!e.player || !e.player.classList.contains('open')) return; + const willMinimize = !e.player.classList.contains('minimized'); + e.player.classList.toggle('minimized'); + if (willMinimize) exitFullscreenIfNeeded(); + updateMinimizedTitle(); +} + +function minimizePlayer() { + const e = els(); + if (!e.player || !e.player.classList.contains('open')) return; + e.player.classList.add('minimized'); + exitFullscreenIfNeeded(); + updateMinimizedTitle(); +} + +function updateMinimizedTitle() { + const e = els(); + if (!e.restoreTitle) return; + e.restoreTitle.textContent = currentMedia?.file_name ? `Restore: ${currentMedia.file_name}` : 'Restore player'; +} + export function exitFullscreenIfNeeded() { if (document.fullscreenElement) { document.exitFullscreen().catch(() => {}); |
