From 300af4477f823285c6a2b294e6ccbe30dcde1e1b Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Tue, 24 May 2022 12:02:37 -0600
Subject: [PATCH] fx-compat: Fix Attach Link dialog

---
 chrome/content/zotero/attachLink.js           |  8 ++++++++
 .../{attachLink.xul => attachLink.xhtml}      | 19 ++++++++++---------
 chrome/content/zotero/zoteroPane.js           |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)
 rename chrome/content/zotero/{attachLink.xul => attachLink.xhtml} (72%)

diff --git a/chrome/content/zotero/attachLink.js b/chrome/content/zotero/attachLink.js
index c6fe5a3e56..e48dba14fd 100644
--- a/chrome/content/zotero/attachLink.js
+++ b/chrome/content/zotero/attachLink.js
@@ -24,6 +24,14 @@
 */
 
 var Zotero_AttachLink = new function() {
+	this.load = function () {
+		document.addEventListener('dialogaccept', (event) => {
+			if (!this.submit()) {
+				event.preventDefault();
+			}
+		});
+	};
+
 	function getAttachFileLabel() {
 		return window.opener.document
 			.getElementById('zotero-tb-attachment-add-file-link')
diff --git a/chrome/content/zotero/attachLink.xul b/chrome/content/zotero/attachLink.xhtml
similarity index 72%
rename from chrome/content/zotero/attachLink.xul
rename to chrome/content/zotero/attachLink.xhtml
index 4e39dc7c39..3a5b7877ec 100644
--- a/chrome/content/zotero/attachLink.xul
+++ b/chrome/content/zotero/attachLink.xhtml
@@ -4,14 +4,14 @@
 
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
-<dialog
+<window
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	buttons="accept,cancel"
-	ondialogaccept="return Zotero_AttachLink.submit();"
-	
-	id="zotero-attach-uri-dialog"
+	xmlns:html="http://www.w3.org/1999/xhtml"
 	title="&zotero.attachLink.title;"
-	>
+	onload="Zotero_AttachLink.load()">
+<dialog
+	buttons="accept,cancel"
+	id="zotero-attach-uri-dialog">
 	
 	<script src="include.js"/>
 	<script src="attachLink.js"/>
@@ -22,11 +22,12 @@
 		</hbox>
 		<hbox align="center">
 			<label id="zotero-attach-uri-label-input" value="&zotero.attachLink.label.link;" control="zotero-attach-uri-input"></label>
-			<textbox id="zotero-attach-uri-input" flex="1"/>
+			<html:input type="text" id="zotero-attach-uri-input" style="-moz-box-flex: 1"/>
 		</hbox>
 		<hbox align="center">
 			<label id="zotero-attach-uri-label-title" value="&zotero.attachLink.label.title;" control="zotero-attach-uri-title"></label>
-			<textbox id="zotero-attach-uri-title" flex="1" placeholder="&zotero.general.optional;"/>
+			<html:input type="text" id="zotero-attach-uri-title" style="-moz-box-flex: 1" placeholder="&zotero.general.optional;"/>
 		</hbox>
 	</vbox>
-</dialog>
\ No newline at end of file
+</dialog>
+</window>
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 64073ce594..7f1511c915 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -3795,7 +3795,7 @@ var ZoteroPane = new function()
 		}
 		
 		var io = {};
-		window.openDialog('chrome://zotero/content/attachLink.xul',
+		window.openDialog('chrome://zotero/content/attachLink.xhtml',
 			'zotero-attach-uri-dialog', 'centerscreen, modal', io);
 		if (!io.out) return;
 		return Zotero.Attachments.linkFromURL({