From 3a1b4e34aa0b3c4bfd6012b5560a3541e12e9285 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Tue, 29 Sep 2020 00:18:24 -0700 Subject: [PATCH] Don't show export table fetching message when auto-refreshing --- data/interfaces/default/js/tables/export_table.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/data/interfaces/default/js/tables/export_table.js b/data/interfaces/default/js/tables/export_table.js index f23ff5b8..baaf3465 100644 --- a/data/interfaces/default/js/tables/export_table.js +++ b/data/interfaces/default/js/tables/export_table.js @@ -163,16 +163,18 @@ export_table_options = { //$('html,body').scrollTop(0); $('#ajaxMsg').fadeOut(); - if (timer) { - clearTimeout(timer); + if (export_processing_timer) { + clearTimeout(export_processing_timer); } if ($('.export-processing').length) { - timer = setTimeout(redrawExportTable.bind(null, false), 2000); + export_processing_timer = setTimeout(redrawExportTable.bind(null, false), 2000); } }, "preDrawCallback": function(settings) { - var msg = "  Fetching rows..."; - showMsg(msg, false, false, 0) + if (!export_processing_timer) { + var msg = "  Fetching rows..."; + showMsg(msg, false, false, 0) + } }, "rowCallback": function (row, rowData, rowIndex) { if (rowData['complete'] === 0) { @@ -204,4 +206,4 @@ function redrawExportTable(paging) { export_table.draw(paging); } -var timer; \ No newline at end of file +var export_processing_timer; \ No newline at end of file