mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Address review comments

Browse source
This commit is contained in:
ferferga 2020-06-24 19:50:54 +02:00
parent 6325046b96
commit ab12e6e4ad
2 changed files with 14 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/components/nowPlayingBar/nowPlayingBar.js
View file

@ -195,7 +195,6 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
case 'RepeatOne': case 'RepeatOne':
playbackManager.setRepeatMode('RepeatNone'); playbackManager.setRepeatMode('RepeatNone');
break; break;
default:
case 'RepeatNone': case 'RepeatNone':
playbackManager.setRepeatMode('RepeatAll'); playbackManager.setRepeatMode('RepeatAll');
} }
@ -203,11 +202,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
toggleRepeatButtonIcon = toggleRepeatButton.querySelector('.material-icons'); toggleRepeatButtonIcon = toggleRepeatButton.querySelector('.material-icons');
if (appHost.supports('physicalvolumecontrol')) { volumeSliderContainer.classList.toggle('hide', appHost.supports('physicalvolumecontrol'));
volumeSliderContainer.classList.add('hide');
} else {
volumeSliderContainer.classList.remove('hide');
}
function setVolume() { function setVolume() {
if (currentPlayer) { if (currentPlayer) {
@ -371,8 +366,8 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
toggleRepeatButtonIcon.classList.add('repeat_one'); toggleRepeatButtonIcon.classList.add('repeat_one');
toggleRepeatButton.classList.add(cssClass); toggleRepeatButton.classList.add(cssClass);
break; break;
default:
case 'RepeatNone': case 'RepeatNone':
default:
toggleRepeatButtonIcon.classList.add('repeat'); toggleRepeatButtonIcon.classList.add('repeat');
toggleRepeatButton.classList.remove(cssClass); toggleRepeatButton.classList.remove(cssClass);
break; break;
@ -445,11 +440,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
// See bindEvents for why this is necessary // See bindEvents for why this is necessary
if (volumeSlider) { if (volumeSlider) {
if (showVolumeSlider) { volumeSliderContainer.classList.toggle('hide', showVolumeSlider);
volumeSliderContainer.classList.remove('hide');
} else {
volumeSliderContainer.classList.add('hide');
}
if (!volumeSlider.dragging) { if (!volumeSlider.dragging) {
volumeSlider.value = volumeLevel || 0; volumeSlider.value = volumeLevel || 0;
@ -630,6 +621,10 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
} }
function onQueueShuffleModeChange() { function onQueueShuffleModeChange() {
if (!isEnabled) {
return;
}
let shuffleMode = playbackManager.getQueueShuffleMode(); let shuffleMode = playbackManager.getQueueShuffleMode();
let context = nowPlayingBarElement; let context = nowPlayingBarElement;
const cssClass = 'shuffleQueue-active'; const cssClass = 'shuffleQueue-active';
@ -637,11 +632,11 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
switch (shuffleMode) { switch (shuffleMode) {
case 'Shuffle': case 'Shuffle':
toggleShuffleButton.classList.toggle(cssClass, true); toggleShuffleButton.classList.add(cssClass);
break; break;
default:
case 'Sorted': case 'Sorted':
toggleShuffleButton.classList.toggle(cssClass, false); default:
toggleShuffleButton.classList.remove(cssClass);
break; break;
} }
} }

17
src/components/remotecontrol/remotecontrol.js
View file

@ -258,10 +258,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
case 'RepeatOne': case 'RepeatOne':
playbackManager.setRepeatMode('RepeatNone'); playbackManager.setRepeatMode('RepeatNone');
break; break;
default:
case 'RepeatNone': case 'RepeatNone':
playbackManager.setRepeatMode('RepeatAll'); playbackManager.setRepeatMode('RepeatAll');
break;
} }
} }
@ -362,8 +360,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
case 'RepeatOne': case 'RepeatOne':
innHtml = '<span class="material-icons repeat_one"></span>'; innHtml = '<span class="material-icons repeat_one"></span>';
break; break;
default:
case 'RepeatNone': case 'RepeatNone':
default:
repeatOn = false; repeatOn = false;
break; break;
} }
@ -407,21 +405,14 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
if (!showMuteButton && !showVolumeSlider) { if (!showMuteButton && !showVolumeSlider) {
context.querySelector('.volumecontrol').classList.add('hide'); context.querySelector('.volumecontrol').classList.add('hide');
} else { } else {
if (showMuteButton) { buttonMute.classList.toggle('hide', showMuteButton);
buttonMute.classList.remove('hide');
} else {
buttonMute.classList.add('hide');
}
var nowPlayingVolumeSlider = context.querySelector('.nowPlayingVolumeSlider'); var nowPlayingVolumeSlider = context.querySelector('.nowPlayingVolumeSlider');
var nowPlayingVolumeSliderContainer = context.querySelector('.nowPlayingVolumeSliderContainer'); var nowPlayingVolumeSliderContainer = context.querySelector('.nowPlayingVolumeSliderContainer');
if (nowPlayingVolumeSlider) { if (nowPlayingVolumeSlider) {
if (showVolumeSlider) {
nowPlayingVolumeSliderContainer.classList.remove('hide'); nowPlayingVolumeSliderContainer.classList.toggle('hide', !showVolumeSlider);
} else {
nowPlayingVolumeSliderContainer.classList.add('hide');
}
if (!nowPlayingVolumeSlider.dragging) { if (!nowPlayingVolumeSlider.dragging) {
nowPlayingVolumeSlider.value = volumeLevel || 0; nowPlayingVolumeSlider.value = volumeLevel || 0;