From 228e8407a76d38e6aed71bcd04d92e712c9bc644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Mon, 31 Oct 2022 09:45:16 +0200 Subject: [PATCH] Make colored tagging via keyboard layout independent Report https://forums.zotero.org/discussion/100717/tag-number-shortcut-with-mac-raccourci-clavier-pour-marqueurs-avec-un-mac --- chrome/content/zotero/itemTree.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/itemTree.jsx b/chrome/content/zotero/itemTree.jsx index 109dbcbe3a..f718fe8a63 100644 --- a/chrome/content/zotero/itemTree.jsx +++ b/chrome/content/zotero/itemTree.jsx @@ -38,7 +38,7 @@ const { Cc, Ci, Cu } = require('chrome'); Cu.import("resource://gre/modules/osfile.jsm"); const CHILD_INDENT = 12; -const COLORED_TAGS_RE = new RegExp("^[0-" + Zotero.Tags.MAX_COLORED_TAGS + "]{1}$"); +const COLORED_TAGS_RE = new RegExp("^(?:Numpad|Digit)([0-" + Zotero.Tags.MAX_COLORED_TAGS + "]{1})$"); const COLUMN_PREFS_FILEPATH = OS.Path.join(Zotero.Profile.dir, "treePrefs.json"); const ATTACHMENT_STATE_LOAD_DELAY = 150; //ms @@ -869,9 +869,9 @@ var ItemTree = class ItemTree extends LibraryTree { } return false; } - if (!event.shiftKey && !event.ctrlKey && !event.metaKey && !event.altKey && COLORED_TAGS_RE.test(event.key)) { + if (!event.shiftKey && !event.ctrlKey && !event.metaKey && !event.altKey && COLORED_TAGS_RE.test(event.code)) { let libraryID = this.collectionTreeRow.ref.libraryID; - let position = parseInt(event.key) - 1; + let position = COLORED_TAGS_RE.exec(event.code)[1] - 1; // When 0 is pressed, remove all colored tags if (position == -1) { let items = this.getSelectedItems();