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

fx-compat: Disable macKeyset completely on non-Mac (#3044)

Browse source
This commit is contained in:
Abe Jellinek 2023-03-25 04:06:48 -04:00 committed by GitHub
parent 2b3ee82d56
commit ca2b84af8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
chrome/content/zotero/platformKeys.js
View file

@ -43,9 +43,17 @@ window.addEventListener('DOMContentLoaded', () => {
// Set behavior on all non-macOS platforms
if (applicationMenu) applicationMenu.hidden = true;
if (windowMenu) windowMenu.hidden = true;
// DEBUG: This doesn't disable Ctrl-Q, which shouldn't be active on Windows
// (fx102 follow-up to https://github.com/zotero/zotero/pull/3010)
if (macKeyset) macKeyset.disabled = true;
if (macKeyset) {
macKeyset.setAttribute('disabled', true);
// Keys display on menu items even when disabled individually, so just remove the relevant attributes
// Relevant platform code:
// https://searchfox.org/mozilla-central/rev/3ba3d0a57b6419206f82f80cd6c30faf59397664/toolkit/content/widgets/menu.js#295
for (let key of macKeyset.querySelectorAll('key')) {
key.removeAttribute('modifiers');
key.removeAttribute('keycode');
key.removeAttribute('key');
}
}
if (isWin) {
fileQuitItemUnix.hidden = true;