From 6de7fdedf985ca1fddecf7371bb444566ff868d3 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 20 Jul 2017 02:59:18 -0400
Subject: [PATCH] Take tag selector out of the tab order, for now

This restores the 4.0 behavior. It's not ideal, but neither is having to
tab through thousands of items to get to the items pane (unless you
toggle the tag selector closed first). Hopefully we can come up with a
better solution to make the tags accessible.
---
 chrome/content/zotero/bindings/tagselector.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/bindings/tagselector.xml b/chrome/content/zotero/bindings/tagselector.xml
index 4264e5b2c..97ae6dafa 100644
--- a/chrome/content/zotero/bindings/tagselector.xml
+++ b/chrome/content/zotero/bindings/tagselector.xml
@@ -914,6 +914,9 @@
 					if (tagObj.type) {
 						elem.setAttribute('tagType', tagObj.type);
 					}
+					// Take the tags out of the tab order so that tabbing moves from the collections
+					// pane to the items pane
+					elem.setAttribute('tabindex', "-1");
 					return elem;
 				]]></body>
 			</method>
@@ -1157,14 +1160,15 @@
 						<label value="&zotero.tagSelector.noTagsToDisplay;"/>
 					</box>
 					
-					<html:div id="tags-box"/>
+					<html:div id="tags-box" tabindex="-1"/>
 				</deck>
 				
 				<vbox id="tag-controls">
 					<hbox>
 						<textbox id="tags-search" flex="1" type="search" timeout="250" dir="reverse"
-							oncommand="document.getBindingParent(this).handleKeyPress(); event.stopPropagation()"
-							onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { document.getBindingParent(this).handleKeyPress(true); }"/>
+							onkeypress="document.getBindingParent(this).onKeyPress(event)"
+							oncommand="document.getBindingParent(this).onCommand(event)"
+							tabindex="-1"/>
 						<toolbarbutton id="view-settings-menu" tooltiptext="&zotero.toolbar.actions.label;"
 								image="chrome://zotero/skin/tag-selector-menu.png" type="menu">
 							<menupopup id="view-settings-popup"