From e4150aa8b063414d725941a7eeb2be21997b0644 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Mon, 26 Feb 2018 22:57:03 +0300
Subject: [PATCH] sort only after filtering is complete

---
 manage/filters.js | 25 ++++++++++++++-----------
 manage/manage.js  |  4 ++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/manage/filters.js b/manage/filters.js
index 99facf33..eefae5a5 100644
--- a/manage/filters.js
+++ b/manage/filters.js
@@ -156,12 +156,14 @@ function filterOnChange({target: el, forceRefilter}) {
     unhide: buildFilter(false),
   });
   if (installed) {
-    reapplyFilter();
-    sorter.update();
+    reapplyFilter().then(() =>
+      sorter.update());
   }
 }
 
-
+/**
+ * @returns {Promise} resolves on async search
+ */
 function filterAndAppend({entry, container}) {
   if (!container) {
     container = [entry];
@@ -170,15 +172,16 @@ function filterAndAppend({entry, container}) {
       entry.classList.add('hidden');
     }
   }
-  reapplyFilter(container);
+  return reapplyFilter(container);
 }
 
-
+/**
+ * @returns {Promise} resolves on async search
+ */
 function reapplyFilter(container = installed, alreadySearched) {
   if (!alreadySearched && $('#search').value.trim()) {
-    searchStyles({immediately: true, container})
+    return searchStyles({immediately: true, container})
       .then(() => reapplyFilter(container, true));
-    return;
   }
   // A: show
   let toHide = [];
@@ -191,7 +194,7 @@ function reapplyFilter(container = installed, alreadySearched) {
   // showStyles() is building the page and no filters are active
   if (toUnhide instanceof DocumentFragment) {
     installed.appendChild(toUnhide);
-    return;
+    return Promise.resolve();
   }
   // filtering needed or a single-element job from handleUpdate()
   for (const entry of toUnhide.children || toUnhide) {
@@ -208,7 +211,7 @@ function reapplyFilter(container = installed, alreadySearched) {
   }
   if (!toHide.length) {
     showFiltersStats();
-    return;
+    return Promise.resolve();
   }
   for (const entry of toHide) {
     entry.classList.add('hidden');
@@ -219,14 +222,14 @@ function reapplyFilter(container = installed, alreadySearched) {
   if (container instanceof DocumentFragment) {
     installed.appendChild(container);
     showFiltersStats();
-    return;
+    return Promise.resolve();
   }
   // single-element job from handleEvent(): add the last wraith
   if (toHide.length === 1 && toHide[0].parentElement !== installed) {
     installed.appendChild(toHide[0]);
   }
   showFiltersStats();
-  return;
+  return Promise.resolve();
 
   /***************************************/
 
diff --git a/manage/manage.js b/manage/manage.js
index 3a618dd6..47c77aaf 100644
--- a/manage/manage.js
+++ b/manage/manage.js
@@ -535,8 +535,8 @@ function handleUpdate(style, {reason, method, codeIsUpdated} = {}) {
   if ((reason === 'update' || reason === 'install') && entry.matches('.updatable')) {
     handleUpdateInstalled(entry, reason);
   }
-  filterAndAppend({entry});
-  sorter.update();
+  filterAndAppend({entry}).then(() =>
+    sorter.update());
   if (!entry.matches('.hidden') && reason !== 'import') {
     animateElement(entry);
     requestAnimationFrame(() => scrollElementIntoView(entry));