From 4a1812e5bac6336ffd2c75decac7b08ac132c4b4 Mon Sep 17 00:00:00 2001
From: Martynas Bagdonas <git.martynas@gmail.com>
Date: Tue, 24 May 2022 11:46:54 +0300
Subject: [PATCH] fx-compat: Fix selectItemsDialog

---
 chrome/content/zotero/selectItemsDialog.js    |  2 +
 ...temsDialog.xul => selectItemsDialog.xhtml} | 66 ++++++++++---------
 2 files changed, 37 insertions(+), 31 deletions(-)
 rename chrome/content/zotero/{selectItemsDialog.xul => selectItemsDialog.xhtml} (62%)

diff --git a/chrome/content/zotero/selectItemsDialog.js b/chrome/content/zotero/selectItemsDialog.js
index 0df60fe803..909b83af3b 100644
--- a/chrome/content/zotero/selectItemsDialog.js
+++ b/chrome/content/zotero/selectItemsDialog.js
@@ -79,6 +79,8 @@ var doLoad = async function () {
 	}
 	
 	Zotero.updateQuickSearchBox(document);
+
+	document.addEventListener('dialogaccept', doAccept);
 };
 
 function doUnload()
diff --git a/chrome/content/zotero/selectItemsDialog.xul b/chrome/content/zotero/selectItemsDialog.xhtml
similarity index 62%
rename from chrome/content/zotero/selectItemsDialog.xul
rename to chrome/content/zotero/selectItemsDialog.xhtml
index a93c7cef8d..7d1d831458 100644
--- a/chrome/content/zotero/selectItemsDialog.xul
+++ b/chrome/content/zotero/selectItemsDialog.xhtml
@@ -30,40 +30,44 @@
 <?xml-stylesheet href="chrome://zotero-platform/content/zotero-react-client.css"?>
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
-<dialog
+
+<window
 	id="zotero-select-items-dialog"
 	windowtype="zotero:item-selector"
-	title="&zotero.selectitems.title;"
-	orient="vertical"
-	width="600" height="450"
-	buttons="cancel,accept"
-	ondialogaccept="doAccept();"
-	onload="doLoad();"
-	onunload="doUnload();"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
-	style="padding:2em"
-	persist="screenX screenY width height">
-	
-	<script src="include.js"/>
-	<script src="selectItemsDialog.js"/>
-	
-	<vbox id="zotero-select-items-container" flex="1">
-	
-	<hbox align="center" pack="end">
-		<textbox id="zotero-tb-search" type="search" timeout="250" oncommand="onSearch()" dir="reverse"
-				onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { if (this.value == '') { cancelDialog(); return false; } this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;"/>
-	</hbox>
-	
-	<hbox flex="1">
-		<vbox id="zotero-collections-tree-container" class="virtualized-table-container" style="min-width: 200px">
-			<html:div id="zotero-collections-tree"></html:div>
-		</vbox>
+	onload="doLoad();"
+	onunload="doUnload();"
+	width="600"
+	height="450"
+	persist="screenX screenY width height"
+	style="display: flex"
+>
+	<dialog
+		orient="vertical"
+		buttons="cancel,accept"
+		style="padding: 2em"
+	>
+		<script src="include.js"/>
+		<script src="selectItemsDialog.js"/>
 
-		<hbox id="zotero-items-pane-content" class="virtualized-table-container" flex="1">
-			<html:div id="zotero-items-tree"></html:div>
+		<vbox id="zotero-select-items-container" flex="1">
+
+		<hbox align="center" pack="end">
+			<search-textbox id="zotero-tb-search" type="search" timeout="250" oncommand="onSearch()" dir="reverse"
+					onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { if (this.value == '') { cancelDialog(); return false; } this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;"/>
 		</hbox>
-	</hbox>
-	
-	</vbox>
-</dialog>
+
+		<hbox flex="1">
+			<vbox id="zotero-collections-tree-container" class="virtualized-table-container" style="min-width: 200px">
+				<html:div id="zotero-collections-tree"></html:div>
+			</vbox>
+
+			<hbox id="zotero-items-pane-content" class="virtualized-table-container" flex="1">
+				<html:div id="zotero-items-tree"></html:div>
+			</hbox>
+		</hbox>
+
+		</vbox>
+	</dialog>
+</window>
\ No newline at end of file