From cf51aead637d004f9b8134e0eb1eeab1b61e5548 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 5 May 2019 12:36:40 +0200
Subject: [PATCH] Larry: Fix regression where menu actions didn't work with
 keyboard (#6740)

For Elastic remove Space/Enter key handler on menus, so we use
default browser behaviour. Triggering a onclick programatically
causes popup window warning sometimes.
---
 CHANGELOG                              | 2 ++
 program/include/rcmail_output_html.php | 2 +-
 skins/elastic/ui.js                    | 5 -----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f93578410..44d3378ea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,9 +18,11 @@ CHANGELOG Roundcube Webmail
 - Elastic: Fix non-working pretty selects in Chrome browser (#6705)
 - Elastic: Various internal refactorings
 - Elastic: Fix issue with absolute positioned mail content (#6739)
+- Elastic: Fix bug where some menu actions could cause a browser popup warning
 - Managesieve: Fix bug where global includes were requested for vacation (#6716)
 - Managesieve: Use RFC-compliant line endings, CRLF instead of LF (#6686)
 - Managesieve: Fix so "Create filter" option does not show up when Filters menu is disabled (#6723)
+- Larry: Fix regression where menu actions didn't work with keyboard (#6740)
 - Fix so advanced search dialog is not automatically displayed on searchonly addressbooks (#6679)
 - Fix so an error is logged when more than one attachment plugin has been enabled, initialize the first one (#6735)
 - Fix bug where flag change could have been passed to a preview frame when not expected
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 89fb3988a..f2499d7ca 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -1652,7 +1652,7 @@ EOF;
         }
 
         // overwrite attributes
-        if (!$attrib['href'] && !$menuitem) {
+        if (!$attrib['href']) {
             $attrib['href'] = '#';
         }
 
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 2f281593f..1bc11b542 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -2276,11 +2276,6 @@ function rcube_elastic_ui()
                                 $(item).popover('toggle').focus();
                                 return false;
 
-                            case 13: // ENTER
-                            case 32: // SPACE
-                                $(this).trigger('click').data('event', 'key');
-                                return false; // for IE
-
                             case 38: // ARROW-UP
                             case 63232:
                                 mode = 'previous';