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

Merge remote-tracking branch 'upstream/master' into es6

Browse source 
With conflicts
This commit is contained in:
MrTimscampi 2020-07-24 10:23:14 +02:00
commit 3713091382
165 changed files with 4194 additions and 2714 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/scripts/serverNotifications.js
View file

@ -36,28 +36,28 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
console.debug('Received command: ' + cmd.Name);
switch (cmd.Name) {
case 'Select':
inputManager.trigger('select');
inputManager.handleCommand('select');
return;
case 'Back':
inputManager.trigger('back');
inputManager.handleCommand('back');
return;
case 'MoveUp':
inputManager.trigger('up');
inputManager.handleCommand('up');
return;
case 'MoveDown':
inputManager.trigger('down');
inputManager.handleCommand('down');
return;
case 'MoveLeft':
inputManager.trigger('left');
inputManager.handleCommand('left');
return;
case 'MoveRight':
inputManager.trigger('right');
inputManager.handleCommand('right');
return;
case 'PageUp':
inputManager.trigger('pageup');
inputManager.handleCommand('pageup');
return;
case 'PageDown':
inputManager.trigger('pagedown');
inputManager.handleCommand('pagedown');
return;
case 'PlayTrailers':
playTrailers(apiClient, cmd.Arguments.ItemId);
@ -65,26 +65,29 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
case 'SetRepeatMode':
playbackManager.setRepeatMode(cmd.Arguments.RepeatMode);
break;
case 'SetShuffleQueue':
playbackManager.setQueueShuffleMode(cmd.Arguments.ShuffleMode);
break;
case 'VolumeUp':
inputManager.trigger('volumeup');
inputManager.handleCommand('volumeup');
return;
case 'VolumeDown':
inputManager.trigger('volumedown');
inputManager.handleCommand('volumedown');
return;
case 'ChannelUp':
inputManager.trigger('channelup');
inputManager.handleCommand('channelup');
return;
case 'ChannelDown':
inputManager.trigger('channeldown');
inputManager.handleCommand('channeldown');
return;
case 'Mute':
inputManager.trigger('mute');
inputManager.handleCommand('mute');
return;
case 'Unmute':
inputManager.trigger('unmute');
inputManager.handleCommand('unmute');
return;
case 'ToggleMute':
inputManager.trigger('togglemute');
inputManager.handleCommand('togglemute');
return;
case 'SetVolume':
notifyApp();
@ -99,19 +102,19 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
playbackManager.setSubtitleStreamIndex(parseInt(cmd.Arguments.Index));
break;
case 'ToggleFullscreen':
inputManager.trigger('togglefullscreen');
inputManager.handleCommand('togglefullscreen');
return;
case 'GoHome':
inputManager.trigger('home');
inputManager.handleCommand('home');
return;
case 'GoToSettings':
inputManager.trigger('settings');
inputManager.handleCommand('settings');
return;
case 'DisplayContent':
displayContent(cmd, apiClient);
break;
case 'GoToSearch':
inputManager.trigger('search');
inputManager.handleCommand('search');
return;
case 'DisplayMessage':
displayMessage(cmd);
@ -162,19 +165,19 @@ define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'in
}
} else if (msg.MessageType === 'Playstate') {
if (msg.Data.Command === 'Stop') {
inputManager.trigger('stop');
inputManager.handleCommand('stop');
} else if (msg.Data.Command === 'Pause') {
inputManager.trigger('pause');
inputManager.handleCommand('pause');
} else if (msg.Data.Command === 'Unpause') {
inputManager.trigger('play');
inputManager.handleCommand('play');
} else if (msg.Data.Command === 'PlayPause') {
inputManager.trigger('playpause');
inputManager.handleCommand('playpause');
} else if (msg.Data.Command === 'Seek') {
playbackManager.seek(msg.Data.SeekPositionTicks);
} else if (msg.Data.Command === 'NextTrack') {
inputManager.trigger('next');
inputManager.handleCommand('next');
} else if (msg.Data.Command === 'PreviousTrack') {
inputManager.trigger('previous');
inputManager.handleCommand('previous');
} else {
notifyApp();
}