From b8545590d5e634e6d3d0c46f9dc62ca70209f2c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Mon, 30 Aug 2021 09:57:28 +0300 Subject: [PATCH] HTML Tree: more fixes to find as you type --- chrome/content/zotero/collectionTree.jsx | 5 +++-- chrome/content/zotero/itemTree.jsx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/collectionTree.jsx b/chrome/content/zotero/collectionTree.jsx index 73b3343e2e..8e0c3bc8d2 100644 --- a/chrome/content/zotero/collectionTree.jsx +++ b/chrome/content/zotero/collectionTree.jsx @@ -153,7 +153,7 @@ var CollectionTree = class CollectionTree extends LibraryTree { else if (event.key == "F2" && !Zotero.isMac && treeRow.isCollection()) { this.handleActivate(event, [this.selection.focused]); } - else if (event.key.length == 1 && !(event.ctrlKey || event.metaKey || !event.altKey)) { + else if (event.key.length == 1 && !(event.ctrlKey || event.metaKey || event.altKey)) { this.handleTyping(event.key); } return true; @@ -207,7 +207,8 @@ var CollectionTree = class CollectionTree extends LibraryTree { } async handleTyping(char) { - this._typingString += char.toLowerCase(); + char = char.toLowerCase(); + this._typingString += char; let allSameChar = true; for (let i = this._typingString.length - 1; i >= 0; i--) { if (char != this._typingString[i]) { diff --git a/chrome/content/zotero/itemTree.jsx b/chrome/content/zotero/itemTree.jsx index 776be22c57..6fab329133 100644 --- a/chrome/content/zotero/itemTree.jsx +++ b/chrome/content/zotero/itemTree.jsx @@ -826,7 +826,8 @@ var ItemTree = class ItemTree extends LibraryTree { } handleTyping(char) { - this._typingString += char.toLowerCase(); + char = char.toLowerCase(); + this._typingString += char; let allSameChar = true; for (let i = this._typingString.length - 1; i >= 0; i--) { if (char != this._typingString[i]) { @@ -931,7 +932,7 @@ var ItemTree = class ItemTree extends LibraryTree { this.collapseAllRows(); return false; } - else if (!(event.ctrlKey || event.metaKey || !event.altKey) && event.key.length == 1 && (event.key != " " || this._typingString.length > 1)) { + else if (!(event.ctrlKey || event.metaKey || event.altKey) && event.key.length == 1 && (event.key != " " || this._typingString.length > 1)) { this.handleTyping(event.key); return false; }