Proof of concept note view in tab mode

chrome/content/zotero/tabs.js

@@ -197,6 +197,9 @@ var Zotero_Tabs = new function () {
 		this._selectedID = id;
 		this.deck.selectedIndex = Array.from(this.deck.children).findIndex(x => x.id == id);
 		this._update();
+		if (this.onTabSelect) {
+			this.onTabSelect(tab.type);
+		}
 	};
 
 	/**

chrome/content/zotero/xpcom/reader.js

@@ -481,6 +481,22 @@ class ReaderTab extends ReaderInstance {
 		}
 	}
 	
+	_toggleNoteSidebar(isToggled) {
+		let itemPane = this._window.document.getElementById('zotero-item-pane');
+		var noteEditor = this._window.document.getElementById('zotero-note-editor');
+		let item = noteEditor.item;
+		let zp = Zotero.getActiveZoteroPane();
+		if (itemPane.hidden) {
+			if (item) {
+				zp.selectItem(item.id);
+				itemPane.hidden = false;
+			}
+		}
+		else {
+			itemPane.hidden = true;
+		}
+	}
+	
 	_setTitleValue(title) {
 		this._window.Zotero_Tabs.rename(this.tabID, title);
 	}

chrome/content/zotero/zoteroPane.js

@@ -131,6 +131,29 @@ var ZoteroPane = new function()
 		
 		// continue loading pane
 		_loadPane();
+		
+		Zotero_Tabs.onTabSelect = (type) => {
+			let toolbar = document.getElementById('zotero-pane-horizontal-space');
+			let extendedToolbar = document.getElementById('zotero-reader-toolbar-extension');
+			let itemPane = document.getElementById('zotero-item-pane');
+			if (type == 'library') {
+				toolbar.hidden = false;
+				extendedToolbar.hidden = true;
+				itemPane.hidden = false;
+			}
+			else {
+				toolbar.hidden = true;
+				extendedToolbar.hidden = false;
+				let items = ZoteroPane_Local.itemsView.getSelectedItems();
+				
+				if (items.length == 1 && items[0].isNote()) {
+					itemPane.hidden = false;
+				}
+				else {
+				itemPane.hidden = true;
+				}
+			}
+		}
 	};
 	
 	/**

chrome/content/zotero/zoteroPane.xul

@@ -74,13 +74,8 @@
 	</commandset>
 	
 	<stack id="zotero-pane-stack">
-		<deck id="tabs-deck">
+		<vbox>
-			<vbox id="zotero-pane"
+			<vbox id="zotero-pane-horizontal-space">
-				onkeydown="ZoteroPane_Local.handleKeyDown(event, this.id)"
-				onkeyup="ZoteroPane_Local.handleKeyUp(event, this.id)"
-				onkeypress="ZoteroPane_Local.handleKeyPress(event)"
-				chromedir="&locale.dir;">
-				
 				<toolbar id="zotero-toolbar" class="toolbar toolbar-primary">
 					<hbox id="zotero-collections-toolbar" align="center">
 						<toolbarbutton id="zotero-tb-collection-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>
@@ -229,7 +224,15 @@
 						<div id="retracted-items-close">×</div>
 					</div>
 				</vbox>
+			</vbox>
 		
+			<hbox flex="1">
+				<deck flex="1" id="tabs-deck">
+					<vbox id="zotero-pane"
+						onkeydown="ZoteroPane_Local.handleKeyDown(event, this.id)"
+						onkeyup="ZoteroPane_Local.handleKeyUp(event, this.id)"
+						onkeypress="ZoteroPane_Local.handleKeyPress(event)"
+						chromedir="&locale.dir;">
 						<popupset>
 							<!-- Allows iframes to show a tooltip popup for nodes with titles. `tooltip="iframeTooltip"` attribute has to be set for the iframe -->
 							<tooltip id="iframeTooltip" onpopupshowing="if (tooltipTitleNode = document.tooltipNode.closest('*[title]')) {this.setAttribute('label', tooltipTitleNode.getAttribute('title')); return true; } return false"/>
@@ -294,7 +297,8 @@
 								<menuitem class="menuitem-iconic zotero-menuitem-create-parent" oncommand="ZoteroPane_Local.createParentItemsFromSelected();"/>
 								<menuitem class="menuitem-iconic zotero-menuitem-rename-from-parent" oncommand="ZoteroPane_Local.renameSelectedAttachmentsFromParents()"/>
 								<menuitem class="menuitem-iconic zotero-menuitem-reindex" oncommand="ZoteroPane_Local.reindexItem();"/>
-						<menuitem class="menuitem-iconic zotero-menuitem-import-annotations" label="&zotero.items.menu.importAnnotations;" oncommand="ZoteroPane.importAnnotationsForSelected()"/>
+								<!--					<menuitem class="menuitem-iconic zotero-menuitem-import-annotations" label="&zotero.items.menu.importAnnotations;" oncommand="ZoteroPane.importAnnotationsForSelected()"/>-->
+								<menuitem class="menuitem-iconic zotero-menuitem-import-annotations" label="Import annotations" oncommand="ZoteroPane.importAnnotationsForSelected()"/>
 							</menupopup>
 							
 							<tooltip id="fake-tooltip"/>
@@ -562,6 +566,10 @@
 											ondrop="ZoteroPane.itemsView.onDrop(event); ZoteroPane.itemsView.drop(-1, -1, event.dataTransfer)"/>
 									</deck>
 								</vbox>
+							</box>
+						</hbox>
+					</vbox>
+				</deck>
 				
 				<splitter id="zotero-items-splitter" resizebefore="closest" resizeafter="closest" collapse="after" orient="horizontal" zotero-persist="state orient"
 					onmousemove="ZoteroPane.updateToolbarPosition(); ZoteroPane.updateTagsBoxSize()"
@@ -569,12 +577,14 @@
 					<grippy id="zotero-items-grippy"/>
 				</splitter>
 		
+				<vbox>
+					<hbox id="zotero-reader-toolbar-extension" height="32" hidden="true"></hbox>
 					<!-- itemPane.xul -->
 					<vbox id="zotero-item-pane"/>
-					</box>
+				</vbox>
 			</hbox>
 		</vbox>
-		</deck>
+
 
 		<!-- Barrier to prevent tabbing into Zotero pane when busy -->
 		<box id="zotero-pane-tab-catcher-bottom" hidden="true" align="center" pack="center" style="opacity: 0">