From 7b26dab2f2ae1a6a98c79017aa368c480c8e2fce Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Tue, 15 Aug 2023 17:51:43 -0400
Subject: [PATCH] Show spread mode menu items in EPUB reader

Fixes #3318 (only odd spreads supported right now because of CSS grid
limitations)
---
 chrome/content/zotero/reader.xhtml             | 5 +++--
 chrome/content/zotero/standalone/standalone.js | 8 +++++---
 chrome/content/zotero/xpcom/reader.js          | 8 +++++---
 chrome/content/zotero/zoteroPane.xhtml         | 5 +++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/chrome/content/zotero/reader.xhtml b/chrome/content/zotero/reader.xhtml
index ff8a95f8c3..be9187b19f 100644
--- a/chrome/content/zotero/reader.xhtml
+++ b/chrome/content/zotero/reader.xhtml
@@ -181,14 +181,14 @@
 				<menuseparator class="menu-type-reader pdf"/>
 				<menuitem
 					id="view-menuitem-no-spreads"
-					class="menu-type-reader pdf"
+					class="menu-type-reader pdf epub"
 					label="&zotero.pdfReader.noSpreads;"
 					type="checkbox"
 					oncommand="reader.spreadMode = 0"
 				/>
 				<menuitem
 					id="view-menuitem-odd-spreads"
-					class="menu-type-reader pdf"
+					class="menu-type-reader pdf epub"
 					label="&zotero.pdfReader.oddSpreads;"
 					type="checkbox"
 					oncommand="reader.spreadMode = 1"
@@ -200,6 +200,7 @@
 					type="checkbox"
 					oncommand="reader.spreadMode = 2"
 				/>
+				<menuseparator class="menu-type-reader pdf epub"/>
 				<menuitem
 					id="view-menuitem-scrolled"
 					class="menu-type-reader epub"
diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js
index 6702f099f3..dbbc89f27d 100644
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@@ -410,14 +410,16 @@ const ZoteroStandalone = new function() {
 		// PDF Reader
 		var reader = Zotero.Reader.getByTabID(Zotero_Tabs.selectedID);
 		if (reader) {
+			if (reader.type === 'pdf' || reader.type === 'epub') {
+				this.updateMenuItemCheckmark('view-menuitem-no-spreads', reader.spreadMode === 0);
+				this.updateMenuItemCheckmark('view-menuitem-odd-spreads', reader.spreadMode === 1);
+				this.updateMenuItemCheckmark('view-menuitem-even-spreads', reader.spreadMode === 2);
+			}
 			if (reader.type === 'pdf') {
 				this.updateMenuItemCheckmark('view-menuitem-hand-tool', reader.toolType === 'hand');
 				this.updateMenuItemCheckmark('view-menuitem-vertical-scrolling', reader.scrollMode === 0);
 				this.updateMenuItemCheckmark('view-menuitem-horizontal-scrolling', reader.scrollMode === 1);
 				this.updateMenuItemCheckmark('view-menuitem-wrapped-scrolling', reader.scrollMode === 2);
-				this.updateMenuItemCheckmark('view-menuitem-no-spreads', reader.spreadMode === 0);
-				this.updateMenuItemCheckmark('view-menuitem-odd-spreads', reader.spreadMode === 1);
-				this.updateMenuItemCheckmark('view-menuitem-even-spreads', reader.spreadMode === 2);
 				this.updateMenuItemCheckmark('view-menuitem-zoom-auto', reader.zoomAutoEnabled);
 				this.updateMenuItemCheckmark('view-menuitem-zoom-page-width', reader.zoomPageWidthEnabled);
 				this.updateMenuItemCheckmark('view-menuitem-zoom-page-height', reader.zoomPageHeightEnabled);
diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js
index c30b12b4de..22a95215b3 100644
--- a/chrome/content/zotero/xpcom/reader.js
+++ b/chrome/content/zotero/xpcom/reader.js
@@ -1132,13 +1132,15 @@ class ReaderWindow extends ReaderInstance {
 	}
 
 	_onViewMenuOpen() {
+		if (this._type === 'pdf' || this._type === 'epub') {
+			this._window.document.getElementById('view-menuitem-no-spreads').setAttribute('checked', this._internalReader.spreadMode === 0);
+			this._window.document.getElementById('view-menuitem-odd-spreads').setAttribute('checked', this._internalReader.spreadMode === 1);
+			this._window.document.getElementById('view-menuitem-even-spreads').setAttribute('checked', this._internalReader.spreadMode === 2);
+		}
 		if (this._type === 'pdf') {
 			this._window.document.getElementById('view-menuitem-vertical-scrolling').setAttribute('checked', this._internalReader.scrollMode === 0);
 			this._window.document.getElementById('view-menuitem-horizontal-scrolling').setAttribute('checked', this._internalReader.scrollMode === 1);
 			this._window.document.getElementById('view-menuitem-wrapped-scrolling').setAttribute('checked', this._internalReader.scrollMode === 2);
-			this._window.document.getElementById('view-menuitem-no-spreads').setAttribute('checked', this._internalReader.spreadMode === 0);
-			this._window.document.getElementById('view-menuitem-odd-spreads').setAttribute('checked', this._internalReader.spreadMode === 1);
-			this._window.document.getElementById('view-menuitem-even-spreads').setAttribute('checked', this._internalReader.spreadMode === 2);
 			this._window.document.getElementById('view-menuitem-hand-tool').setAttribute('checked', this._internalReader.toolType === 'hand');
 			this._window.document.getElementById('view-menuitem-zoom-auto').setAttribute('checked', this._internalReader.zoomAutoEnabled);
 			this._window.document.getElementById('view-menuitem-zoom-page-width').setAttribute('checked', this._internalReader.zoomPageWidthEnabled);
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index 12a96bff2b..4df632c577 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -340,14 +340,14 @@
 							<menuseparator class="menu-type-reader pdf"/>
 							<menuitem
 								id="view-menuitem-no-spreads"
-								class="menu-type-reader pdf"
+								class="menu-type-reader pdf epub"
 								type="checkbox"
 								label="&zotero.pdfReader.noSpreads;"
 								oncommand="ZoteroStandalone.currentReader.spreadMode = 0"
 							/>
 							<menuitem
 								id="view-menuitem-odd-spreads"
-								class="menu-type-reader pdf"
+								class="menu-type-reader pdf epub"
 								type="checkbox"
 								label="&zotero.pdfReader.oddSpreads;"
 								oncommand="ZoteroStandalone.currentReader.spreadMode = 1"
@@ -359,6 +359,7 @@
 								label="&zotero.pdfReader.evenSpreads;"
 								oncommand="ZoteroStandalone.currentReader.spreadMode = 2"
 							/>
+							<menuseparator class="menu-type-reader epub"/>
 							<menuitem
 								id="view-menuitem-scrolled"
 								class="menu-type-reader epub"