From da0d0aca2ab098382237e0ea6f04b37d97129f87 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Thu, 18 Dec 2014 07:03:37 -0500
Subject: [PATCH] Avoid useless reloading list when resetting search with active filter (#1490057)

---
 program/js/app.js |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 4e65a9c..e920789 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1215,7 +1215,8 @@
 
       // reset quicksearch
       case 'reset-search':
-        var n, s = this.env.search_request || this.env.qsearch;
+        var n, s = this.env.search_request || this.env.qsearch,
+            ss = this.gui_objects.qsearchbox && this.gui_objects.qsearchbox.value != '';
 
         this.reset_qsearch();
         this.select_all_mode = false;
@@ -1224,7 +1225,7 @@
           if (this.contact_list)
             this.list_contacts_clear();
         }
-        else if (s && this.env.mailbox) {
+        else if (s && ss && this.env.mailbox) {
           this.list_mailbox(this.env.mailbox, 1);
         }
         else if (s && this.task == 'addressbook') {

--
Gitblit v1.9.1