Elastic: Close search options on Enter key press in quick-search input (#6660)

CHANGELOG

@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Password: Added ldap_exop driver (#4992)
+- Elastic: Close search options on Enter key press in quick-search input (#6660)
 - Elastic: Changed read/unread icons (#6636)
 - Elastic: Changed "Move to..." icon (#6637)
 - Elastic: Add hide/show for advanced preferences (#6632)

skins/elastic/ui.js

@@ -1968,6 +1968,11 @@ function rcube_elastic_ui()
                     return true;
                 }
             },
+            close_func = function() {
+                if ($(bar).is('.open')) {
+                    options_button.click();
+                }
+            },
             update_func = function() {
                 $(bar)[is_search_pending() ? 'addClass' : 'removeClass']('active');
             };
@@ -2024,15 +2029,11 @@ function rcube_elastic_ui()
             update_func();
         });
 
-        rcmail.addEventListener('init', function() { update_func(); })
-            .addEventListener('beforelist', function() {
-                if ($(bar).is('.open')) {
-                    options_button.click(); // close options form on 'list' request
-                }
-            })
-            .addEventListener('responsebeforesearch', function() {
-                update_func();
-            });
+        rcmail.addEventListener('init', update_func)
+            .addEventListener('responsebeforesearch', update_func)
+            // close options form on list/search request
+            .addEventListener('beforelist', close_func)
+            .addEventListener('beforesearch', close_func);
     };
 
     /**