Skip to content

Commit 907a6b4

Browse files
authored
Merge pull request #16863 from nextcloud/ignore-enter-key-up-event-on-menu-button-toggles
Ignore Enter key up event on menu button toggles
2 parents f0c5bac + cb93af6 commit 907a6b4

8 files changed

Lines changed: 13 additions & 18 deletions

File tree

core/js/dist/login.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/login.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/main.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/maintenance.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/maintenance.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/OC/menu.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ let currentMenuToggle = null
3939
export const registerMenu = ($toggle, $menuEl, toggle, headerMenu) => {
4040
$menuEl.addClass('menu')
4141

42-
// On link, the enter key trigger a click event
42+
// On link and button, the enter key trigger a click event
4343
// Only use the click to avoid two fired events
44-
$toggle.on($toggle.prop('tagName') === 'A'
44+
$toggle.on(($toggle.prop('tagName') === 'A' || $toggle.prop('tagName') === 'BUTTON')
4545
? 'click.menu'
4646
: 'click.menu keyup.menu', function (event) {
4747
// prevent the link event (append anchor to URL)

package-lock.json

Lines changed: 5 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)