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

Replace trigger and handle with handleCommand

Browse source
This commit is contained in:
MrTimscampi 2020-07-18 23:38:00 +02:00
parent a2ac8353fa
commit 8ed2a185ee
5 changed files with 42 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/elements/emby-itemscontainer/emby-itemscontainer.js
View file

@ -30,7 +30,7 @@ define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager',
// check for serverId, it won't be present on selectserver // check for serverId, it won't be present on selectserver
if (card && card.getAttribute('data-serverid')) { if (card && card.getAttribute('data-serverid')) {
inputManager.trigger('menu', { inputManager.handleCommand('menu', {
sourceElement: card sourceElement: card
}); });

6
src/scripts/inputManager.js
View file

@ -235,9 +235,6 @@ import appHost from 'apphost';
} }
} }
// Alias for backward compatibility
export const trigger = handleCommand;
dom.addEventListener(document, 'click', notify, { dom.addEventListener(document, 'click', notify, {
passive: true passive: true
}); });
@ -245,8 +242,7 @@ import appHost from 'apphost';
/* eslint-enable indent */ /* eslint-enable indent */
export default { export default {
trigger: handleCommand, handleCommand: handleCommand,
handle: handleCommand,
notify: notify, notify: notify,
notifyMouseMove: notifyMouseMove, notifyMouseMove: notifyMouseMove,
idleTime: idleTime, idleTime: idleTime,

28
src/scripts/keyboardNavigation.js
View file

@ -90,53 +90,53 @@ export function enable() {
switch (key) { switch (key) {
case 'ArrowLeft': case 'ArrowLeft':
inputManager.handle('left'); inputManager.handleCommand('left');
break; break;
case 'ArrowUp': case 'ArrowUp':
inputManager.handle('up'); inputManager.handleCommand('up');
break; break;
case 'ArrowRight': case 'ArrowRight':
inputManager.handle('right'); inputManager.handleCommand('right');
break; break;
case 'ArrowDown': case 'ArrowDown':
inputManager.handle('down'); inputManager.handleCommand('down');
break; break;
case 'Back': case 'Back':
inputManager.handle('back'); inputManager.handleCommand('back');
break; break;
case 'Escape': case 'Escape':
if (layoutManager.tv) { if (layoutManager.tv) {
inputManager.handle('back'); inputManager.handleCommand('back');
} else { } else {
capture = false; capture = false;
} }
break; break;
case 'MediaPlay': case 'MediaPlay':
inputManager.handle('play'); inputManager.handleCommand('play');
break; break;
case 'Pause': case 'Pause':
inputManager.handle('pause'); inputManager.handleCommand('pause');
break; break;
case 'MediaPlayPause': case 'MediaPlayPause':
inputManager.handle('playpause'); inputManager.handleCommand('playpause');
break; break;
case 'MediaRewind': case 'MediaRewind':
inputManager.handle('rewind'); inputManager.handleCommand('rewind');
break; break;
case 'MediaFastForward': case 'MediaFastForward':
inputManager.handle('fastforward'); inputManager.handleCommand('fastforward');
break; break;
case 'MediaStop': case 'MediaStop':
inputManager.handle('stop'); inputManager.handleCommand('stop');
break; break;
case 'MediaTrackPrevious': case 'MediaTrackPrevious':
inputManager.handle('previoustrack'); inputManager.handleCommand('previoustrack');
break; break;
case 'MediaTrackNext': case 'MediaTrackNext':
inputManager.handle('nexttrack'); inputManager.handleCommand('nexttrack');
break; break;
default: default:

2
src/scripts/libraryMenu.js
View file

@ -116,7 +116,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
} }
function showSearch() { function showSearch() {
inputManager.trigger('search'); inputManager.handleCommand('search');
} }
function onHeaderUserButtonClick(e) { function onHeaderUserButtonClick(e) {

50
src/scripts/serverNotifications.js
View file

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