From 0b81fef4579daf5569aa65b9fa2d4bc4c0907c40 Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Thu, 21 Dec 2023 16:32:52 -0800 Subject: [PATCH] Show sidenav in feeds --- chrome/content/zotero/elements/abstractBox.js | 2 ++ chrome/content/zotero/elements/itemBox.js | 2 ++ chrome/content/zotero/elements/itemPaneSidenav.js | 4 ++-- chrome/content/zotero/elements/paneHeader.js | 2 ++ chrome/content/zotero/itemPane.js | 12 ++++++++++++ chrome/skin/default/zotero/itemPane.css | 5 ----- 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/chrome/content/zotero/elements/abstractBox.js b/chrome/content/zotero/elements/abstractBox.js index ac3f4fdf7d..cac26b7818 100644 --- a/chrome/content/zotero/elements/abstractBox.js +++ b/chrome/content/zotero/elements/abstractBox.js @@ -34,6 +34,8 @@ `); + + showInFeeds = true; _item = null; diff --git a/chrome/content/zotero/elements/itemBox.js b/chrome/content/zotero/elements/itemBox.js index 8051ba2f28..5ac5607bfd 100644 --- a/chrome/content/zotero/elements/itemBox.js +++ b/chrome/content/zotero/elements/itemBox.js @@ -43,6 +43,8 @@ this.blurHandler = null; this.eventHandlers = []; + this.showInFeeds = true; + this._mode = 'view'; this._visibleFields = []; this._hiddenFields = []; diff --git a/chrome/content/zotero/elements/itemPaneSidenav.js b/chrome/content/zotero/elements/itemPaneSidenav.js index 4716473936..06708aed7a 100644 --- a/chrome/content/zotero/elements/itemPaneSidenav.js +++ b/chrome/content/zotero/elements/itemPaneSidenav.js @@ -165,11 +165,11 @@ }; getPanes() { - return Array.from(this.container.querySelectorAll(':scope > [data-pane]')); + return Array.from(this.container.querySelectorAll(':scope > [data-pane]:not([hidden])')); } getPane(id) { - return this.container.querySelector(`:scope > [data-pane="${CSS.escape(id)}"]`); + return this.container.querySelector(`:scope > [data-pane="${CSS.escape(id)}"]:not([hidden])`); } isPanePinnable(id) { diff --git a/chrome/content/zotero/elements/paneHeader.js b/chrome/content/zotero/elements/paneHeader.js index 708d4e67a9..4cb702d8e8 100644 --- a/chrome/content/zotero/elements/paneHeader.js +++ b/chrome/content/zotero/elements/paneHeader.js @@ -46,6 +46,8 @@ `, ['chrome://zotero/locale/zotero.dtd']); + showInFeeds = true; + _item = null; _titleFieldID = null; diff --git a/chrome/content/zotero/itemPane.js b/chrome/content/zotero/itemPane.js index 4d0b2f2e0a..3877094657 100644 --- a/chrome/content/zotero/itemPane.js +++ b/chrome/content/zotero/itemPane.js @@ -89,6 +89,16 @@ var ZoteroItemPane = new function() { let inTrash = ZoteroPane.collectionsView.selectedTreeRow && ZoteroPane.collectionsView.selectedTreeRow.isTrash(); for (let box of [_header, ..._boxes]) { + if (!box.showInFeeds && item.isFeedItem) { + box.style.display = 'none'; + box.hidden = true; + continue; + } + else { + box.style.display = ''; + box.hidden = false; + } + if (mode) { box.mode = mode; @@ -112,6 +122,8 @@ var ZoteroItemPane = new function() { else if (pinnedPane !== false) { _sidenav.scrollToPane('info', 'instant'); } + + _sidenav.render(); }); diff --git a/chrome/skin/default/zotero/itemPane.css b/chrome/skin/default/zotero/itemPane.css index 3deb0f8285..6dc6320f62 100644 --- a/chrome/skin/default/zotero/itemPane.css +++ b/chrome/skin/default/zotero/itemPane.css @@ -43,11 +43,6 @@ pointer-events: none; } -.zotero-view-item-container.feed-item .zotero-view-item > :is(attachments-box, notes-box, tags-box, related-box), -.zotero-view-item-container.feed-item .zotero-view-item-sidenav { - display: none; -} - .zotero-view-item > * { box-sizing: border-box; width: 100%;