Fix missing full text search cancellation #977 (#978)

Signed off by @danielzgtg
kiwix · Mar 12, 2023 · d52c5d5 · d52c5d5
1 parent f5c749a
commit d52c5d5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/www/js/lib/zimArchive.js b/www/js/lib/zimArchive.js
@@ -253,6 +253,10 @@ define(['zimfile', 'zimDirEntry', 'util', 'uiUtil', 'utf8'],
         search.scanCount = 0;
         // Launch a full-text search if possible
         if (LZ) that.findDirEntriesFromFullTextSearch(search, dirEntries).then(function (fullTextDirEntries) {
+            // If user initiated a new search, cancel this one
+            // In particular, do not set the search status back to 'complete'
+            // as that would cause outdated results to unexpectedly pop up
+            if (search.status === 'cancelled') return callback([], search);
             dirEntries = fullTextDirEntries;
             search.status = 'complete';
             callback(dirEntries, search);