mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2025-10-24 18:37:40 +00:00
Code Issues Releases Wiki Activity

Fix: disable shortcuts for disabled features

Browse Source
This commit is contained in:
jcorporation
2018-11-15 21:56:36 +00:00
parent b764580a69
commit 51f09d4bf8
2 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
htdocs/js/keymap.js
View File

@@ -1,30 +1,30 @@
var keymap = { var keymap = {
"ArrowLeft": {"cmd": "clickPrev", "options": [], "action": "Previous Song", "key": "keyboard_arrow_left"}, "ArrowLeft": {"cmd": "clickPrev", "options": [], "desc": "Previous Song", "key": "keyboard_arrow_left"},
"ArrowRight": {"cmd": "clickNext", "options": [], "action": "Next Song", "key": "keyboard_arrow_right"}, "ArrowRight": {"cmd": "clickNext", "options": [], "desc": "Next Song", "key": "keyboard_arrow_right"},
" ": {"cmd": "clickPlay", "options": [], "action": "Toggle Play / Pause", "key": "space_bar"}, " ": {"cmd": "clickPlay", "options": [], "desc": "Toggle Play / Pause", "key": "space_bar"},
"s": {"cmd": "clickStop", "options": [], "action": "Stop Playing"}, "s": {"cmd": "clickStop", "options": [], "desc": "Stop Playing"},
"-": {"cmd": "chVolume", "options": [-5], "action": "Volume Down"}, "-": {"cmd": "chVolume", "options": [-5], "desc": "Volume Down"},
"+": {"cmd": "chVolume", "options": [5], "action": "Volume Up"}, "+": {"cmd": "chVolume", "options": [5], "desc": "Volume Up"},
"c": {"cmd": "MPD_API_QUEUE_CLEAR", "options": [], "action": "Clear Queue"}, "c": {"cmd": "MPD_API_QUEUE_CLEAR", "options": [], "desc": "Clear Queue"},
"u": {"cmd": "updateDB", "options": [], "action": "Update Database"}, "u": {"cmd": "updateDB", "options": [], "desc": "Update Database"},
"r": {"cmd": "rescanDB", "options": [], "action": "Rescan Database"}, "r": {"cmd": "rescanDB", "options": [], "desc": "Rescan Database"},
"l": {"cmd": "openLocalPlayer", "options": [], "action": "Open Local Player"}, "l": {"cmd": "openLocalPlayer", "options": [], "desc": "Open Local Player", "req": "featLocalplayer"},
"p": {"cmd": "updateSmartPlaylists", "options": [], "action": "Update Smart Playlists"}, "p": {"cmd": "updateSmartPlaylists", "options": [], "desc": "Update Smart Playlists", "req": "featSmartpls"},
"a": {"cmd": "showAddToPlaylist", "options": ["stream"], "action": "Add Stream"}, "a": {"cmd": "showAddToPlaylist", "options": ["stream"], "desc": "Add Stream"},
"t": {"cmd": "openModal", "options": ["modalSettings"], "action": "Open Settings"}, "t": {"cmd": "openModal", "options": ["modalSettings"], "desc": "Open Settings"},
"y": {"cmd": "openModal", "options": ["modalAbout"], "action": "Open About"}, "y": {"cmd": "openModal", "options": ["modalAbout"], "desc": "Open About"},
"i": {"cmd": "clickTitle", "options": [], "action": "Open Song Details"}, "i": {"cmd": "clickTitle", "options": [], "desc": "Open Song Details"},
"1": {"cmd": "appGoto", "options": ["Playback"], "action": "Goto Playback"}, "1": {"cmd": "appGoto", "options": ["Playback"], "desc": "Goto Playback"},
"2": {"cmd": "appGoto", "options": ["Queue","Current"], "action": "Goto Queue"}, "2": {"cmd": "appGoto", "options": ["Queue","Current"], "desc": "Goto Queue"},
"3": {"cmd": "appGoto", "options": ["Queue","LastPlayed"], "action": "Goto Last Played"}, "3": {"cmd": "appGoto", "options": ["Queue","LastPlayed"], "desc": "Goto Last Played"},
"4": {"cmd": "appGoto", "options": ["Browse","Database"], "action": "Goto Browse Database"}, "4": {"cmd": "appGoto", "options": ["Browse","Database"], "desc": "Goto Browse Database", "req": "featTags"},
"5": {"cmd": "appGoto", "options": ["Browse","Playlists"], "action": "Goto Browse Playlists"}, "5": {"cmd": "appGoto", "options": ["Browse","Playlists"], "desc": "Goto Browse Playlists", "req": "featPlaylists"},
"6": {"cmd": "appGoto", "options": ["Browse","Filesystem"], "action": "Goto Browse Filesystem"}, "6": {"cmd": "appGoto", "options": ["Browse","Filesystem"], "desc": "Goto Browse Filesystem"},
"7": {"cmd": "appGoto", "options": ["Search"], "action": "Goto Search"}, "7": {"cmd": "appGoto", "options": ["Search"], "desc": "Goto Search"},
"m": {"cmd": "openDropdown", "options": ["dropdownMainMenu"], "action": "Open Main Menu"}, "m": {"cmd": "openDropdown", "options": ["dropdownMainMenu"], "desc": "Open Main Menu"},
"v": {"cmd": "openDropdown", "options": ["dropdownVolumeMenu"], "action": "Open Volume Menu"}, "v": {"cmd": "openDropdown", "options": ["dropdownVolumeMenu"], "desc": "Open Volume Menu"},
"S": {"cmd": "MPD_API_QUEUE_SHUFFLE", "options": [], "action": "Shuffle Queue"}, "S": {"cmd": "MPD_API_QUEUE_SHUFFLE", "options": [], "desc": "Shuffle Queue"},
"C": {"cmd": "MPD_API_QUEUE_CROP", "options": [], "action": "Crop Queue"}, "C": {"cmd": "MPD_API_QUEUE_CROP", "options": [], "desc": "Crop Queue"},
"?": {"cmd": "openModal", "options": ["modalHelp"], "action": "Open Help"}, "?": {"cmd": "openModal", "options": ["modalHelp"], "desc": "Open Help"},
"/": {"cmd": "focusSearch", "options": [], "action": "Focus Search"} "/": {"cmd": "focusSearch", "options": [], "desc": "Focus Search"}
} }

8
htdocs/js/mympd.js
View File

@@ -367,8 +367,9 @@ function appInit() {
document.getElementById('modalHelp').addEventListener('show.bs.modal', function () { document.getElementById('modalHelp').addEventListener('show.bs.modal', function () {
var trs = ''; var trs = '';
for (var key in keymap) { for (var key in keymap) {
trs += '<tr><td><div class="key' + (keymap[key].key && keymap[key].key.length > 1 ? ' material-icons material-icons-small' : '') + if (keymap[key].req == undefined || settings[keymap[key].req] == true)
'">' + (keymap[key].key != undefined ? keymap[key].key : key ) + '</div></td><td>' + keymap[key].action + '</td></tr>'; trs += '<tr><td><div class="key' + (keymap[key].key && keymap[key].key.length > 1 ? ' material-icons material-icons-small' : '') +
'">' + (keymap[key].key != undefined ? keymap[key].key : key ) + '</div></td><td>' + keymap[key].desc + '</td></tr>';
} }
document.getElementById('tbodyShortcuts').innerHTML = trs; document.getElementById('tbodyShortcuts').innerHTML = trs;
}); });
@@ -641,7 +642,8 @@ function appInit() {
return; return;
var cmd = keymap[event.key]; var cmd = keymap[event.key];
if (cmd && typeof window[cmd.cmd] === 'function') { if (cmd && typeof window[cmd.cmd] === 'function') {
parseCmd(event, cmd); if (keymap[event.key].req == undefined || settings[keymap[event.key].req] == true)
parseCmd(event, cmd);
} }
}, false); }, false);