mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fx-compat: Fix progress queue / Find Available PDFs

Browse source
This commit is contained in:
Abe Jellinek 2022-05-24 13:52:38 -06:00
parent 195dd379d9
commit 29b270e761
5 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
chrome/content/zotero/progressQueueDialog.xul → chrome/content/zotero/progressQueueDialog.xhtml
View file

@ -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;"/>

4
chrome/content/zotero/xpcom/progressQueueDialog.js
View file

@ -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);
}

1
chrome/content/zotero/xpcom/report.js
View file

@ -198,6 +198,7 @@ Zotero.Report.HTML = new function () {
case 'tags':
case 'deleted':
case 'parentItem':
case 'inPublications':
case 'charset':
case 'contentType':

2
test/content/support.js
View file

@ -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) {

18
test/tests/recognizePDFTest.js
View file

@ -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);