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

Rename 'Playlist' term to 'Queue'

Browse source
This commit is contained in:
ferferga 2020-06-22 11:25:16 +02:00
parent 2e8e240aa0
commit 6aae85e991
6 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -181,10 +181,10 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
elem.querySelector('.btnShuffle').addEventListener('click', function () { elem.querySelector('.btnShuffle').addEventListener('click', function () {
if (currentPlayer) { if (currentPlayer) {
if (playbackManager.getPlaylistShuffleMode(currentPlayer) === 'Sorted') { if (playbackManager.getQueueShuffleMode(currentPlayer) === 'Sorted') {
playbackManager.setPlaylistShuffleMode('Shuffle', currentPlayer); playbackManager.setQueueShuffleMode('Shuffle', currentPlayer);
} else { } else {
playbackManager.setPlaylistShuffleMode('Sorted', currentPlayer); playbackManager.setQueueShuffleMode('Sorted', currentPlayer);
} }
} }
}); });
@ -346,7 +346,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
} }
updateRepeatModeDisplay(playState.RepeatMode); updateRepeatModeDisplay(playState.RepeatMode);
onPlaylistShuffleModeChange(); onQueueShuffleModeChange();
updatePlayerVolumeState(playState.IsMuted, playState.VolumeLevel); updatePlayerVolumeState(playState.IsMuted, playState.VolumeLevel);
@ -633,8 +633,8 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
updateRepeatModeDisplay(playbackManager.getRepeatMode(player)); updateRepeatModeDisplay(playbackManager.getRepeatMode(player));
} }
function onPlaylistShuffleModeChange() { function onQueueShuffleModeChange() {
let shuffleMode = playbackManager.getPlaylistShuffleMode(this); let shuffleMode = playbackManager.getQueueShuffleMode(this);
let context = nowPlayingBarElement; let context = nowPlayingBarElement;
let toggleShuffleButton = context.querySelector('.btnShuffle'); let toggleShuffleButton = context.querySelector('.btnShuffle');
@ -750,7 +750,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
events.off(player, 'playbackstart', onPlaybackStart); events.off(player, 'playbackstart', onPlaybackStart);
events.off(player, 'statechange', onPlaybackStart); events.off(player, 'statechange', onPlaybackStart);
events.off(player, 'repeatmodechange', onRepeatModeChange); events.off(player, 'repeatmodechange', onRepeatModeChange);
events.off(player, 'shuffleplaylistmodechange', onPlaylistShuffleModeChange); events.off(player, 'shufflequeuemodechange', onQueueShuffleModeChange);
events.off(player, 'playbackstop', onPlaybackStopped); events.off(player, 'playbackstop', onPlaybackStopped);
events.off(player, 'volumechange', onVolumeChanged); events.off(player, 'volumechange', onVolumeChanged);
events.off(player, 'pause', onPlayPauseStateChanged); events.off(player, 'pause', onPlayPauseStateChanged);
@ -799,7 +799,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
events.on(player, 'playbackstart', onPlaybackStart); events.on(player, 'playbackstart', onPlaybackStart);
events.on(player, 'statechange', onPlaybackStart); events.on(player, 'statechange', onPlaybackStart);
events.on(player, 'repeatmodechange', onRepeatModeChange); events.on(player, 'repeatmodechange', onRepeatModeChange);
events.on(player, 'shuffleplaylistmodechange', onPlaylistShuffleModeChange); events.on(player, 'shufflequeuemodechange', onQueueShuffleModeChange);
events.on(player, 'playbackstop', onPlaybackStopped); events.on(player, 'playbackstop', onPlaybackStopped);
events.on(player, 'volumechange', onVolumeChanged); events.on(player, 'volumechange', onVolumeChanged);
events.on(player, 'pause', onPlayPauseStateChanged); events.on(player, 'pause', onPlayPauseStateChanged);

24
src/components/playback/playbackmanager.js
View file

@ -2097,7 +2097,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
state.PlayState.IsMuted = player.isMuted(); state.PlayState.IsMuted = player.isMuted();
state.PlayState.IsPaused = player.paused(); state.PlayState.IsPaused = player.paused();
state.PlayState.RepeatMode = self.getRepeatMode(player); state.PlayState.RepeatMode = self.getRepeatMode(player);
state.PlayState.ShuffleMode = self.getPlaylistShuffleMode(player); state.PlayState.ShuffleMode = self.getQueueShuffleMode(player);
state.PlayState.MaxStreamingBitrate = self.getMaxStreamingBitrate(player); state.PlayState.MaxStreamingBitrate = self.getMaxStreamingBitrate(player);
state.PlayState.PositionTicks = getCurrentTicks(player); state.PlayState.PositionTicks = getCurrentTicks(player);
@ -3305,9 +3305,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
sendProgressUpdate(player, 'repeatmodechange'); sendProgressUpdate(player, 'repeatmodechange');
} }
function onShufflePlaylistModeChange() { function onShuffleQueueModeChange() {
var player = this; var player = this;
sendProgressUpdate(player, 'shuffleplaylistmodechange'); sendProgressUpdate(player, 'shufflequeuemodechange');
} }
function onPlaylistItemMove(e) { function onPlaylistItemMove(e) {
@ -3364,7 +3364,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
events.on(player, 'unpause', onPlaybackUnpause); events.on(player, 'unpause', onPlaybackUnpause);
events.on(player, 'volumechange', onPlaybackVolumeChange); events.on(player, 'volumechange', onPlaybackVolumeChange);
events.on(player, 'repeatmodechange', onRepeatModeChange); events.on(player, 'repeatmodechange', onRepeatModeChange);
events.on(player, 'shuffleplaylistmodechange', onShufflePlaylistModeChange); events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
events.on(player, 'playlistitemmove', onPlaylistItemMove); events.on(player, 'playlistitemmove', onPlaylistItemMove);
events.on(player, 'playlistitemremove', onPlaylistItemRemove); events.on(player, 'playlistitemremove', onPlaylistItemRemove);
events.on(player, 'playlistitemadd', onPlaylistItemAdd); events.on(player, 'playlistitemadd', onPlaylistItemAdd);
@ -3377,7 +3377,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
events.on(player, 'unpause', onPlaybackUnpause); events.on(player, 'unpause', onPlaybackUnpause);
events.on(player, 'volumechange', onPlaybackVolumeChange); events.on(player, 'volumechange', onPlaybackVolumeChange);
events.on(player, 'repeatmodechange', onRepeatModeChange); events.on(player, 'repeatmodechange', onRepeatModeChange);
events.on(player, 'shuffleplaylistmodechange', onShufflePlaylistModeChange); events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
events.on(player, 'playlistitemmove', onPlaylistItemMove); events.on(player, 'playlistitemmove', onPlaylistItemMove);
events.on(player, 'playlistitemremove', onPlaylistItemRemove); events.on(player, 'playlistitemremove', onPlaylistItemRemove);
events.on(player, 'playlistitemadd', onPlaylistItemAdd); events.on(player, 'playlistitemadd', onPlaylistItemAdd);
@ -3886,7 +3886,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
'GoToSearch', 'GoToSearch',
'DisplayMessage', 'DisplayMessage',
'SetRepeatMode', 'SetRepeatMode',
'SetPlaylistShuffleMode', 'SetQueueShuffleMode',
'PlayMediaSource', 'PlayMediaSource',
'PlayTrailers' 'PlayTrailers'
]; ];
@ -3941,7 +3941,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
return this._playQueueManager.getRepeatMode(); return this._playQueueManager.getRepeatMode();
}; };
PlaybackManager.prototype.setPlaylistShuffleMode = function (value, player) { PlaybackManager.prototype.setQueueShuffleMode = function (value, player) {
player = player || this._currentPlayer; player = player || this._currentPlayer;
if (player && !enableLocalPlaylistManagement(player)) { if (player && !enableLocalPlaylistManagement(player)) {
@ -3949,14 +3949,14 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
} }
this._playQueueManager.setShuffleMode(value); this._playQueueManager.setShuffleMode(value);
events.trigger(player, 'shuffleplaylistmodechange'); events.trigger(player, 'shufflequeuemodechange');
}; };
PlaybackManager.prototype.getPlaylistShuffleMode = function (player) { PlaybackManager.prototype.getQueueShuffleMode = function (player) {
player = player || this._currentPlayer; player = player || this._currentPlayer;
if (player && !enableLocalPlaylistManagement(player)) { if (player && !enableLocalPlaylistManagement(player)) {
return player.getPlaylistShuffleMode(); return player.getQueueShuffleMode();
} }
return this._playQueueManager.getShuffleMode(); return this._playQueueManager.getShuffleMode();
@ -4030,8 +4030,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
case 'SetRepeatMode': case 'SetRepeatMode':
this.setRepeatMode(cmd.Arguments.RepeatMode, player); this.setRepeatMode(cmd.Arguments.RepeatMode, player);
break; break;
case 'SetPlaylistShuffleMode': case 'SetQueueShuffleMode':
this.setPlaylistShuffleMode(cmd.Arguments.ShuffleMode, player); this.setQueueShuffleMode(cmd.Arguments.ShuffleMode, player);
break; break;
case 'VolumeUp': case 'VolumeUp':
this.volumeUp(player); this.volumeUp(player);

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

@ -328,7 +328,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
} }
updateRepeatModeDisplay(playState.RepeatMode); updateRepeatModeDisplay(playState.RepeatMode);
onShufflePlaylistModeChange(); onShuffleQueueModeChange();
updateNowPlayingInfo(context, state); updateNowPlayingInfo(context, state);
} }
@ -498,8 +498,8 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
updateRepeatModeDisplay(playbackManager.getRepeatMode(player)); updateRepeatModeDisplay(playbackManager.getRepeatMode(player));
} }
function onShufflePlaylistModeChange() { function onShuffleQueueModeChange() {
let shuffleMode = playbackManager.getPlaylistShuffleMode(this); let shuffleMode = playbackManager.getQueueShuffleMode(this);
let context = dlg; let context = dlg;
let shuffleButton = context.querySelector('.btnShuffle'); let shuffleButton = context.querySelector('.btnShuffle');
if ('Sorted' === shuffleMode) { if ('Sorted' === shuffleMode) {
@ -571,7 +571,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
events.off(player, 'playbackstart', onPlaybackStart); events.off(player, 'playbackstart', onPlaybackStart);
events.off(player, 'statechange', onStateChanged); events.off(player, 'statechange', onStateChanged);
events.off(player, 'repeatmodechange', onRepeatModeChange); events.off(player, 'repeatmodechange', onRepeatModeChange);
events.off(player, 'shuffleplaylistmodechange', onShufflePlaylistModeChange); events.off(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
events.off(player, 'playlistitemremove', onPlaylistItemRemoved); events.off(player, 'playlistitemremove', onPlaylistItemRemoved);
events.off(player, 'playlistitemmove', onPlaylistUpdate); events.off(player, 'playlistitemmove', onPlaylistUpdate);
events.off(player, 'playbackstop', onPlaybackStopped); events.off(player, 'playbackstop', onPlaybackStopped);
@ -592,7 +592,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
events.on(player, 'playbackstart', onPlaybackStart); events.on(player, 'playbackstart', onPlaybackStart);
events.on(player, 'statechange', onStateChanged); events.on(player, 'statechange', onStateChanged);
events.on(player, 'repeatmodechange', onRepeatModeChange); events.on(player, 'repeatmodechange', onRepeatModeChange);
events.on(player, 'shuffleplaylistmodechange', onShufflePlaylistModeChange); events.on(player, 'shufflequeuemodechange', onShuffleQueueModeChange);
events.on(player, 'playlistitemremove', onPlaylistItemRemoved); events.on(player, 'playlistitemremove', onPlaylistItemRemoved);
events.on(player, 'playlistitemmove', onPlaylistUpdate); events.on(player, 'playlistitemmove', onPlaylistUpdate);
events.on(player, 'playbackstop', onPlaybackStopped); events.on(player, 'playbackstop', onPlaybackStopped);
@ -695,10 +695,10 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
}); });
context.querySelector('.btnShuffle').addEventListener('click', function () { context.querySelector('.btnShuffle').addEventListener('click', function () {
if (currentPlayer) { if (currentPlayer) {
if (playbackManager.getPlaylistShuffleMode(currentPlayer) === 'Sorted') { if (playbackManager.getQueueShuffleMode(currentPlayer) === 'Sorted') {
playbackManager.setPlaylistShuffleMode('Shuffle', currentPlayer); playbackManager.setQueueShuffleMode('Shuffle', currentPlayer);
} else { } else {
playbackManager.setPlaylistShuffleMode('Sorted', currentPlayer); playbackManager.setQueueShuffleMode('Sorted', currentPlayer);
} }
} }
}); });

10
src/plugins/chromecastPlayer/plugin.js
View file

@ -572,7 +572,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
bindEventForRelay(instance, 'unpause'); bindEventForRelay(instance, 'unpause');
bindEventForRelay(instance, 'volumechange'); bindEventForRelay(instance, 'volumechange');
bindEventForRelay(instance, 'repeatmodechange'); bindEventForRelay(instance, 'repeatmodechange');
bindEventForRelay(instance, 'shuffleplaylistmodechange'); bindEventForRelay(instance, 'shufflequeuemodechange');
events.on(instance._castPlayer, 'playstatechange', function (e, data) { events.on(instance._castPlayer, 'playstatechange', function (e, data) {
@ -652,7 +652,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
'SetSubtitleStreamIndex', 'SetSubtitleStreamIndex',
'DisplayContent', 'DisplayContent',
'SetRepeatMode', 'SetRepeatMode',
'SetPlaylistShuffleMode', 'SetQueueShuffleMode',
'EndSession', 'EndSession',
'PlayMediaSource', 'PlayMediaSource',
'PlayTrailers' 'PlayTrailers'
@ -866,7 +866,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
return state.RepeatMode; return state.RepeatMode;
}; };
ChromecastPlayer.prototype.getPlaylistShuffleMode = function () { ChromecastPlayer.prototype.getQueueShuffleMode = function () {
var state = this.lastPlayerData || {}; var state = this.lastPlayerData || {};
state = state.PlayState || {}; state = state.PlayState || {};
return state.ShuffleMode; return state.ShuffleMode;
@ -892,12 +892,12 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
}); });
}; };
ChromecastPlayer.prototype.setPlaylistShuffleMode = function (value) { ChromecastPlayer.prototype.setQueueShuffleMode = function (value) {
this._castPlayer.sendMessage({ this._castPlayer.sendMessage({
options: { options: {
ShuffleMode: value ShuffleMode: value
}, },
command: 'SetPlaylistShuffleMode' command: 'SetQueueShuffleMode'
}); });
}; };

6
src/plugins/sessionPlayer/plugin.js
View file

@ -506,14 +506,14 @@ define(['playbackManager', 'events', 'serverNotifications', 'connectionManager']
}); });
}; };
SessionPlayer.prototype.setPlaylistShuffleMode = function (mode) { SessionPlayer.prototype.setQueueShuffleMode = function (mode) {
sendCommandByName(this, 'SetPlaylistShuffleMode', { sendCommandByName(this, 'SetQueueShuffleMode', {
ShuffleMode: mode ShuffleMode: mode
}); });
}; };
SessionPlayer.prototype.getPlaylistShuffleMode = function () { SessionPlayer.prototype.getQueueShuffleMode = function () {
}; };

4
src/scripts/serverNotifications.js
View file

@ -65,8 +65,8 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
case 'SetRepeatMode': case 'SetRepeatMode':
playbackManager.setRepeatMode(cmd.Arguments.RepeatMode); playbackManager.setRepeatMode(cmd.Arguments.RepeatMode);
break; break;
case 'SetPlaylistShuffleMode': case 'SetQueueShuffleMode':
playbackManager.setPlaylistShuffleMode(cmd.Arguments.ShuffleMode); playbackManager.setQueueShuffleMode(cmd.Arguments.ShuffleMode);
break; break;
case 'VolumeUp': case 'VolumeUp':
inputManager.trigger('volumeup'); inputManager.trigger('volumeup');