A free, self-hostable news aggregator…
Allow modifiers for open website shortcut (#9186)
Inverle1146d05bdd80
diff --git a/p/scripts/main.js b/p/scripts/main.jsindex b8ddb253a..7fe72574a 100644--- a/p/scripts/main.js+++ b/p/scripts/main.js@@ -1205,13 +1205,13 @@ function init_shortcuts() {});document.addEventListener('keydown', ev => {- if (ev.ctrlKey || ev.metaKey || (ev.altKey && ev.shiftKey) || ev.target.closest('input, select, textarea')) {- return;- }-const s = context.shortcuts;let k = (ev.key.trim() || ev.code || 'Space').toUpperCase();+ if ((ev.ctrlKey && k !== s.go_website) || ev.metaKey || (ev.altKey && ev.shiftKey) || ev.target.closest('input, select, textarea')) {+ return;+ }+// IE11if (k === 'SPACEBAR') k = 'SPACE';else if (k === 'DEL') k = 'DELETE';@@ -1324,14 +1324,6 @@ function init_shortcuts() {return;}- if (ev.altKey || ev.shiftKey) {- return;- }- if (k === s.mark_favorite) { // Toggle the favorite state- mark_favorite(document.querySelector('.flux.current'));- ev.preventDefault();- return;- }if (k === s.go_website) {if (context.auto_mark_site) {mark_read(document.querySelector('.flux.current'), true, false);@@ -1344,6 +1336,15 @@ function init_shortcuts() {}return;}++ if (ev.altKey || ev.shiftKey) {+ return;+ }+ if (k === s.mark_favorite) { // Toggle the favorite state+ mark_favorite(document.querySelector('.flux.current'));+ ev.preventDefault();+ return;+ }const hash = location.hash.substr(1);if (k === s.skip_next_entry) { next_entry(true); ev.preventDefault(); return; }if (k === s.skip_prev_entry) { prev_entry(true); ev.preventDefault(); return; }