Fix button detection in print modal

See #364.
This commit is contained in:
Jaifroid 2023-02-12 16:28:15 +00:00
parent 2bcfa496fc
commit f32157b757

View File

@ -334,13 +334,15 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'cache', 'images
}, true); }, true);
//Set up listeners for print dialogues //Set up listeners for print dialogues
$("#printModal").off('hide.bs.modal'); document.getElementById('confirm-print-continue').addEventListener('click', function () {
appstate.print = 'continue';
});
$("#printModal").on('hide.bs.modal', function () { $("#printModal").on('hide.bs.modal', function () {
//Restore temporarily changed values //Restore temporarily changed values
params.cssSource = settingsStore.getItem('cssSource') || "auto"; params.cssSource = settingsStore.getItem('cssSource') || "auto";
params.cssTheme = settingsStore.getItem('cssTheme') || "light"; params.cssTheme = settingsStore.getItem('cssTheme') || "light";
//params.contentInjectionMode = settingsStore.getItem('contentInjectionMode'); //params.contentInjectionMode = settingsStore.getItem('contentInjectionMode');
if (document.activeElement.id != "confirm-print-continue") { //User cancelled if (appstate.print !== "continue") { //User cancelled
if (params.printInterception) { if (params.printInterception) {
printCleanup(); printCleanup();
return; return;
@ -425,6 +427,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'cache', 'images
//End of listeners for print dialogues //End of listeners for print dialogues
function printIntercept() { function printIntercept() {
appstate.print = null;
params.printInterception = params.printIntercept; params.printInterception = params.printIntercept;
params.printIntercept = false; params.printIntercept = false;
document.getElementById('btnAbout').classList.add('active'); document.getElementById('btnAbout').classList.add('active');