From a1197883bbe62ff16a4d46f31a6419e9fd9c9f6e Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 15 Mar 2013 14:09:31 -0400 Subject: [PATCH] Disable key navigation on 1-6 keys if any tag colors are assigned Previously any unused numbers were still available for key navigation, but I think it's too easy hit the wrong key that way, and getting moved to another part of the items list is annoying. --- chrome/content/zotero/xpcom/itemTreeView.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js index 4309489faf..772899ef2f 100644 --- a/chrome/content/zotero/xpcom/itemTreeView.js +++ b/chrome/content/zotero/xpcom/itemTreeView.js @@ -188,10 +188,13 @@ Zotero.ItemTreeView.prototype._setTreeGenerator = function(treebox) let position = parseInt(key) - 1; return Zotero.Tags.getColorByPosition(libraryID, position) .then(function (colorData) { - // If a color isn't assigned to this number, allow key navigation, - // though I'm not sure this is a good idea. + // If a color isn't assigned to this number or any + // other numbers, allow key navigation if (!colorData) { - return true; + return Zotero.Tags.getColors(libraryID) + .then(function (colors) { + return !Object.keys(colors).length; + }); } var items = self.getSelectedItems();