Merge pull request #9027 from johndoh/list-loading

roundcube · Jan 3, 2025 · 5844fb6 · 5844fb6
2 parents 53b1e7b + c8e4a02
commit 5844fb6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -76,6 +76,7 @@
 - Fix insert_or_update() and reading database server config on PostgreSQL (#9710)
 - Fix Oauth issues with use_secure_urls=true (#9722)
 - Fix handling of binary mail parts (e.g. PDF) encoded with quoted-printable (#9728)
+- Clear "list is empty" message on loading a new list. Previously that message was still visible until the new list was fully loaded, which (if loading was slow) could give the impression that the newly loading is list empty, too. (#9006)
 
 ## Release 1.6.9
 

diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
@@ -633,9 +633,7 @@ function rcube_elastic_ui() {
                             msg = table.data('label-msg'),
                             list = table.is('ul') ? table : table.children('tbody');
 
-                        if (!rcmail.env.search_request && !rcmail.env.qsearch
-                            && msg && !list.children(':visible').length
-                        ) {
+                        if (msg && !list.children(':visible').length) {
                             ext = table.data('label-ext');
                             command = table.data('create-command');
 
@@ -644,15 +642,16 @@ function rcube_elastic_ui() {
                             }
 
                             info.text(msg).removeClass('hidden');
-                            return;
                         }
-
-                        info.addClass('hidden');
                     },
                     callback = function () {
+                        info.addClass('hidden');
+
                         // wait until the UI stops loading and the list is visible
                         if (rcmail.busy || !table.is(':visible')) {
-                            return setTimeout(callback, 250);
+                            clearTimeout(env.list_timer);
+                            env.list_timer = setTimeout(callback, 250);
+                            return;
                         }
 
                         clearTimeout(env.list_timer);

diff --git a/tests/Browser/Contacts/ExportTest.php b/tests/Browser/Contacts/ExportTest.php
@@ -46,7 +46,8 @@ public function testExportAll()
     public function testExportSelected()
     {
         $this->browse(function ($browser) {
-            $browser->ctrlClick('#contacts-table tbody tr:first-child');
+            $browser->waitFor('#contacts-table tbody tr:first-child')
+                ->ctrlClick('#contacts-table tbody tr:first-child');
 
             $browser->clickToolbarMenuItem('export', 'export.select');