From: Alexander Moisseev <moiseev@mezonplus.ru>
Date: Sun, 7 Oct 2018 07:51:08 +0000 (+0300)
Subject: [WebUI] Fix symbol description tooltips display
X-Git-Tag: 1.8.1~76^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2573%2Fhead;p=thirdparty%2Frspamd.git

[WebUI] Fix symbol description tooltips display

when the total number of rows is less than number of rows per page
---

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();
                                 });
                             }