mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

linux: collection highlight on control

Browse source 
On Linux, trigger collection highlighting on Control instead of Alt
to not interfere with the menubar.

Addresses: #3683
This commit is contained in:
Bogdan Abaev 2024-02-08 00:36:02 -05:00 committed by Adomas Ven
parent bf17e5162e
commit 527fa5b12f
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
chrome/content/zotero/zoteroPane.js
View file

@ -1046,14 +1046,18 @@ var ZoteroPane = new function()
if (from == 'zotero-pane') {
// Highlight collections containing selected items
//
// We use Control (17) on Windows because Alt triggers the menubar;
// otherwise we use Alt/Option (18)
// On windows, do not highlight when an input is focused to not interfere with
// Ctrl-C/Ctrl-V copy-paste shortcuts
// We use Control (17) on Windows and Linux because Alt triggers the menubar;
// On Mac, we use Option (18)
let enableHighlight = !event.shiftKey && !event.metaKey;
if (Zotero.isMac) {
enableHighlight = event.key == "Alt" && !event.ctrlKey;
}
else {
enableHighlight = event.key == "Control" && !event.altKey;
}
// Do not interfere with Control-C/Control-V shortcuts
let inputFocused = ["input", "textarea"].includes(document.activeElement.tagName);
if ((Zotero.isWin && event.keyCode == 17 && !event.altKey && !inputFocused) ||
(!Zotero.isWin && event.keyCode == 18 && !event.ctrlKey)
&& !event.shiftKey && !event.metaKey) {
if (enableHighlight && !inputFocused) {
// On windows, the event is re-triggered multiple times
// for as long as Control is held.
// To account for that, stop if a highlight timer already exists.
@ -1066,20 +1070,6 @@ var ZoteroPane = new function()
this.highlightTimer.initWithCallback({
notify: ZoteroPane_Local.setHighlightedRowsCallback
}, 225, Components.interfaces.nsITimer.TYPE_ONE_SHOT);
// Prevent Alt from moving focus to menubar on linux
if (Zotero.isLinux) {
event.preventDefault();
}
}
// Unhighlight on key up
else if ((Zotero.isWin && event.ctrlKey) ||
(!Zotero.isWin && event.altKey)) {
if (this.highlightTimer) {
this.highlightTimer.cancel();
this.highlightTimer = null;
}
ZoteroPane_Local.collectionsView.setHighlightedRows();
}
}
}
@ -1145,8 +1135,9 @@ var ZoteroPane = new function()
function handleKeyUp(event) {
if ((Zotero.isWin && event.keyCode == 17) ||
(!Zotero.isWin && event.keyCode == 18)) {
// When Option/Control is released, clear collection highlighting
if ((Zotero.isMac && event.key == "Alt")
|| (!Zotero.isMac && event.key == "Control")) {
if (this.highlightTimer) {
this.highlightTimer.cancel();
this.highlightTimer = null;