From f7e49630c839b58e6c85c6ae84300f0bec7cd9f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Thu, 24 Mar 2022 11:00:16 +0200 Subject: [PATCH] Fix some more column picker brokenness --- chrome/content/zotero/itemTree.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/itemTree.jsx b/chrome/content/zotero/itemTree.jsx index a53383bd13..e09b1cfc0b 100644 --- a/chrome/content/zotero/itemTree.jsx +++ b/chrome/content/zotero/itemTree.jsx @@ -3594,7 +3594,8 @@ var ItemTree = class ItemTree extends LibraryTree { }); // Filter out ignored columns - let columns = this._getColumns().filter(col => !col.ignoreInColumnPicker); + const columns = this._getColumns(); + let columnMenuitemElements = {}; for (let i = 0; i < columns.length; i++) { const column = columns[i]; if (column.ignoreInColumnPicker === true) continue; @@ -3610,6 +3611,7 @@ var ItemTree = class ItemTree extends LibraryTree { if (column.disabledIn && column.disabledIn.includes(this.collectionTreeRow.visibilityGroup)) { menuitem.setAttribute('disabled', true); } + columnMenuitemElements[column.dataKey] = menuitem; menupopup.appendChild(menuitem); } @@ -3628,7 +3630,7 @@ var ItemTree = class ItemTree extends LibraryTree { for (let i = 0; i < columns.length; i++) { const column = columns[i]; if (column.submenu) { - moreItems.push(menupopup.children[i]); + moreItems.push(columnMenuitemElements[column.dataKey]); } } @@ -3651,8 +3653,6 @@ var ItemTree = class ItemTree extends LibraryTree { Zotero.debug(e, 1); } - // Secondary sort submenu can include columns that cannot have their visibility toggled - columns = this._getColumns(); // // Secondary Sort menu //