extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-31 11:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix hacked printing to wait for dialog.hide() instead of using a timeout and also reduce waiting for the browser to render all rows from 10 to 3ms/row

Browse Source
This commit is contained in:
ralf 2024-08-26 19:14:08 +02:00
parent 3eb3a87cf2
commit 9495dd48b9
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/js/etemplate/et2_extension_nextmatch.ts
View File

@ -2994,7 +2994,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
{
this.set_columns(jQuery.extend([], this.egw().preference(pref, app)));
}
let printDialog;
const callback = function(button, value)
{
if(button === Et2Dialog.CANCEL_BUTTON)
@ -3083,7 +3083,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
egw.lang('Loading'), egw.lang('please wait...'), {}, [
{
"button_id": Et2Dialog.CANCEL_BUTTON,
label: 'cancel',
label: egw.lang('Cancel'),
id: 'dialog[cancel]',
image: 'cancel'
}
@ -3140,15 +3140,10 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
const promises = nodeListArray.map(node => node.updateComplete);
Promise.all(promises).finally(() =>
{
dialog.close();
// Should be OK to print now
dialog.updateComplete.then(() =>
{
window.setTimeout(() => resolve(), 500);
});
dialog.close().then(() => resolve());
});
}, 10 * fetchedCount);
}, 3 * fetchedCount);
}
}, ctx);
@ -3172,10 +3167,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
// No scrollbar in print view
jQuery('.egwGridView_scrollarea', this.div).css('overflow-y', 'hidden');
// Give dialog a chance to close, or it will be in the print
window.setTimeout(function()
{
resolve();
}, 200);
printDialog.close().then(() => resolve());
}
}.bind(this);
const value = {
@ -3193,7 +3185,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
}
}
};
await this._create_print_dialog.call(this, value, callback).updateComplete;
await (printDialog=this._create_print_dialog.call(this, value, callback)).updateComplete;
});
}