From a1ae82be354ddf7c55bd378eff6b618a2734a499 Mon Sep 17 00:00:00 2001 From: Alexander Moisseev Date: Sun, 7 Oct 2018 10:51:08 +0300 Subject: [PATCH] [WebUI] Fix symbol description tooltips display when the total number of rows is less than number of rows per page --- interface/js/app/history.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/js/app/history.js b/interface/js/app/history.js index ca6b21c477..1edd4bf288 100644 --- a/interface/js/app/history.js +++ b/interface/js/app/history.js @@ -624,14 +624,15 @@ define(["jquery", "footable", "humanize"], } ui.getHistory = function (rspamd, tables) { - function waitForRowsDisplayed(callback, iteration) { + function waitForRowsDisplayed(rows_total, callback, iteration) { var i = (typeof iteration === "undefined") ? 10 : iteration; var num_rows = $("#historyTable > tbody > tr").length; - if (num_rows === rows_per_page) { + if (num_rows === rows_per_page || + num_rows === rows_total) { return callback(); } else if (--i) { setTimeout(function () { - waitForRowsDisplayed(callback, i); + waitForRowsDisplayed(rows_total, callback, i); }, 500); } return null; @@ -676,7 +677,7 @@ define(["jquery", "footable", "humanize"], tables.history.rows.load(items); if (version) { // Non-legacy // Is there a way to get an event when all rows are loaded? - waitForRowsDisplayed(function () { + waitForRowsDisplayed(items.length, function () { drawTooltips(); }); } -- 2.47.3