From 93fd947ffac759c2c40a0b3994c5a10356cbee2c Mon Sep 17 00:00:00 2001 From: moisseev Date: Thu, 17 Jun 2021 19:35:34 +0300 Subject: [PATCH] [Minor] Refactor scan history auto-scrolling --- interface/js/app/upload.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/interface/js/app/upload.js b/interface/js/app/upload.js index 88b7da423..39e85640d 100644 --- a/interface/js/app/upload.js +++ b/interface/js/app/upload.js @@ -135,6 +135,15 @@ define(["jquery"], }, method: "POST", success: function (neighbours_status) { + function scrollTop(rows_total) { + // Is there a way to get an event when all rows are loaded? + rspamd.waitForRowsDisplayed("scan", rows_total, function () { + $("html, body").animate({ + scrollTop: $("#scanResult").offset().top + }, 1000); + }); + } + var json = neighbours_status[0].data; if (json.action) { rspamd.alertMessage("alert-success", "Data successfully scanned"); @@ -146,22 +155,13 @@ define(["jquery"], if (Object.prototype.hasOwnProperty.call(tables, "scan")) { tables.scan.rows.load(items, true); - // Is there a way to get an event when all rows are loaded? - rspamd.waitForRowsDisplayed("scan", rows_total, function () { - $("html, body").animate({ - scrollTop: $("#scanResult").offset().top - }, 1000); - }); + scrollTop(rows_total); } else { rspamd.destroyTable("scan"); // Is there a way to get an event when the table is destroyed? setTimeout(function () { rspamd.initHistoryTable(rspamd, data, items, "scan", columns_v2(), true); - rspamd.waitForRowsDisplayed("scan", rows_total, function () { - $("html, body").animate({ - scrollTop: $("#scanResult").offset().top - }, 1000); - }); + scrollTop(rows_total); }, 200); } } else { -- 2.39.5