From c360e178c4ab597de4b8d071f173a9ff3864f052 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 12 Aug 2015 07:52:12 -0400
Subject: [PATCH] Fix so input field (e.g. search box) does not loose focus on list load (#1490455)

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

diff --git a/CHANGELOG b/CHANGELOG
index 1526726..89554ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,6 +38,7 @@
 - Fix removing signature when switching to identity with an empty sig in HTML mode (#1490470)
 - Disable links list generation on html-to-text conversion of identities or composed message (#1490437)
 - Fix "washing" of style elements wrapped into many lines
+- Fix so input field (e.g. search box) does not loose focus on list load (#1490455)
 
 RELEASE 1.1.2
 -------------
diff --git a/program/js/app.js b/program/js/app.js
index f0e9149..212dd86 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -7612,7 +7612,7 @@
               }
 
               this.enable_command('set-listmode', this.env.threads && !is_multifolder);
-              if (list.rowcount > 0)
+              if (list.rowcount > 0 && !$(document.activeElement).is('input,textarea'))
                 list.focus();
               this.msglist_select(list);
             }
@@ -7628,7 +7628,7 @@
             this.enable_command('search-create', this.env.source == '');
             this.enable_command('search-delete', this.env.search_id);
             this.update_group_commands();
-            if (this.contact_list.rowcount > 0)
+            if (this.contact_list.rowcount > 0 && !$(document.activeElement).is('input,textarea'))
               this.contact_list.focus();
             this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
           }

--
Gitblit v1.9.1