From 29b270e7618e6b166da2fbefca1617dddf387aed Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Tue, 24 May 2022 13:52:38 -0600
Subject: [PATCH] fx-compat: Fix progress queue / Find Available PDFs

---
 ...eueDialog.xul => progressQueueDialog.xhtml} |  5 +++--
 .../zotero/xpcom/progressQueueDialog.js        |  4 ++--
 chrome/content/zotero/xpcom/report.js          |  1 +
 test/content/support.js                        |  2 +-
 test/tests/recognizePDFTest.js                 | 18 +++++++++---------
 5 files changed, 16 insertions(+), 14 deletions(-)
 rename chrome/content/zotero/{progressQueueDialog.xul => progressQueueDialog.xhtml} (88%)

diff --git a/chrome/content/zotero/progressQueueDialog.xul b/chrome/content/zotero/progressQueueDialog.xhtml
similarity index 88%
rename from chrome/content/zotero/progressQueueDialog.xul
rename to chrome/content/zotero/progressQueueDialog.xhtml
index a1313067d0..ca693f0b52 100644
--- a/chrome/content/zotero/progressQueueDialog.xul
+++ b/chrome/content/zotero/progressQueueDialog.xhtml
@@ -7,13 +7,14 @@
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	width="550" height="230"
 	onload="_init()"
-	id="zotero-progress">
+	id="zotero-progress"
+	style="display: flex;">
 	<script src="include.js"></script>
 	<script src="progressQueueDialog.js"/>
 	<vbox id="zotero-progress-box" style="padding:10px" flex="1">
 		<label id="label" control="progress-indicator" value=""/>
 		<hbox align="center">
-			<progressmeter id="progress-indicator" mode="determined" flex="1"/>
+			<html:progress id="progress-indicator" max="100" style="-moz-box-flex: 1;"/>
 			<button id="cancel-button" label="&zotero.general.cancel;"/>
 			<button id="minimize-button" label="&zotero.general.minimize;"/>
 			<button id="close-button" label="&zotero.general.close;"/>
diff --git a/chrome/content/zotero/xpcom/progressQueueDialog.js b/chrome/content/zotero/xpcom/progressQueueDialog.js
index 91d538d3c4..fdb55fd72e 100644
--- a/chrome/content/zotero/xpcom/progressQueueDialog.js
+++ b/chrome/content/zotero/xpcom/progressQueueDialog.js
@@ -44,11 +44,11 @@ Zotero.ProgressQueueDialog = function (progressQueue) {
 		
 		let win = Services.wm.getMostRecentWindow("navigator:browser");
 		if (win) {
-			_progressWindow = win.openDialog("chrome://zotero/content/progressQueueDialog.xul",
+			_progressWindow = win.openDialog("chrome://zotero/content/progressQueueDialog.xhtml",
 				"", "chrome,close=yes,resizable=yes,dependent,dialog,centerscreen", _io);
 		}
 		else {
-			_progressWindow = Services.ww.openWindow(null, "chrome://zotero/content/progressQueueDialog.xul",
+			_progressWindow = Services.ww.openWindow(null, "chrome://zotero/content/progressQueueDialog.xhtml",
 				"", "chrome,close=yes,resizable=yes,dependent,dialog,centerscreen", _io);
 		}
 		
diff --git a/chrome/content/zotero/xpcom/report.js b/chrome/content/zotero/xpcom/report.js
index 55e42a81d3..cc69583e90 100644
--- a/chrome/content/zotero/xpcom/report.js
+++ b/chrome/content/zotero/xpcom/report.js
@@ -198,6 +198,7 @@ Zotero.Report.HTML = new function () {
 				case 'tags':
 				case 'deleted':
 				case 'parentItem':
+				case 'inPublications':
 				
 				case 'charset':
 				case 'contentType':
diff --git a/test/content/support.js b/test/content/support.js
index 99e2dbb656..574eaeff5e 100644
--- a/test/content/support.js
+++ b/test/content/support.js
@@ -21,7 +21,7 @@ function waitForDOMEvent(target, event, capture) {
 }
 
 async function waitForRecognizer() {
-	var win = await waitForWindow('chrome://zotero/content/progressQueueDialog.xul')
+	var win = await waitForWindow('chrome://zotero/content/progressQueueDialog.xhtml')
 	// Wait for status to show as complete
 	var completeStr = Zotero.getString("general.finished");
 	while (win.document.getElementById("label").value != completeStr) {
diff --git a/test/tests/recognizePDFTest.js b/test/tests/recognizePDFTest.js
index 37f6768c9c..968bdfc475 100644
--- a/test/tests/recognizePDFTest.js
+++ b/test/tests/recognizePDFTest.js
@@ -14,7 +14,7 @@ describe("PDF Recognition", function() {
 	});
 	
 	afterEach(function() {
-		for(let win of getWindows("chrome://zotero/content/progressQueueDialog.xul")) {
+		for(let win of getWindows("chrome://zotero/content/progressQueueDialog.xhtml")) {
 			win.close();
 		}
 		Zotero.ProgressQueues.get('recognize').cancel();
@@ -51,7 +51,7 @@ describe("PDF Recognition", function() {
 		assert.lengthOf(modifiedIDs, 2);
 		
 		// Wait for status to show as complete
-		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xul")[0];
+		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xhtml")[0];
 		var completeStr = Zotero.getString("general.finished");
 		while (progressWindow.document.getElementById("label").value != completeStr) {
 			await Zotero.Promise.delay(20);
@@ -86,7 +86,7 @@ describe("PDF Recognition", function() {
 		assert.lengthOf(modifiedIDs, 1);
 		
 		// Wait for status to show as complete
-		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xul")[0];
+		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xhtml")[0];
 		var completeStr = Zotero.getString("general.finished");
 		while (progressWindow.document.getElementById("label").value != completeStr) {
 			await Zotero.Promise.delay(20);
@@ -115,7 +115,7 @@ describe("PDF Recognition", function() {
 		assert.lengthOf(modifiedIDs, 1);
 		
 		// Wait for status to show as complete
-		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xul")[0];
+		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xhtml")[0];
 		var completeStr = Zotero.getString("general.finished");
 		while (progressWindow.document.getElementById("label").value != completeStr) {
 			await Zotero.Promise.delay(20);
@@ -147,7 +147,7 @@ describe("PDF Recognition", function() {
 		assert.lengthOf(modifiedIDs, 1);
 		
 		// Wait for status to show as complete
-		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xul")[0];
+		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xhtml")[0];
 		var completeStr = Zotero.getString("general.finished");
 		while (progressWindow.document.getElementById("label").value != completeStr) {
 			await Zotero.Promise.delay(20);
@@ -178,7 +178,7 @@ describe("PDF Recognition", function() {
 		assert.lengthOf(modifiedIDs, 2);
 		
 		// Wait for status to show as complete
-		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xul")[0];
+		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xhtml")[0];
 		var completeStr = Zotero.getString("general.finished");
 		while (progressWindow.document.getElementById("label").value != completeStr) {
 			await Zotero.Promise.delay(20);
@@ -209,7 +209,7 @@ describe("PDF Recognition", function() {
 		assert.lengthOf(modifiedIDs, 2);
 		
 		// Wait for status to show as complete
-		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xul")[0];
+		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xhtml")[0];
 		var completeStr = Zotero.getString("general.finished");
 		while (progressWindow.document.getElementById("label").value != completeStr) {
 			await Zotero.Promise.delay(20);
@@ -243,7 +243,7 @@ describe("PDF Recognition", function() {
 		assert.lengthOf(modifiedIDs, 2);
 		
 		// Wait for status to show as complete
-		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xul")[0];
+		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xhtml")[0];
 		var completeStr = Zotero.getString("general.finished");
 		while (progressWindow.document.getElementById("label").value != completeStr) {
 			await Zotero.Promise.delay(20);
@@ -281,7 +281,7 @@ describe("PDF Recognition", function() {
 		assert.lengthOf(modifiedIDs, 2);
 		
 		// Wait for status to show as complete
-		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xul")[0];
+		var progressWindow = getWindows("chrome://zotero/content/progressQueueDialog.xhtml")[0];
 		var completeStr = Zotero.getString("general.finished");
 		while (progressWindow.document.getElementById("label").value != completeStr) {
 			await Zotero.Promise.delay(20);