From 6d083c4de975a4151026c5942d795f9ab299fd92 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 17 Jul 2018 13:10:25 +0200 Subject: Make left sidebar toggle also work with keyboard Signed-off-by: Jan-Christoph Borchardt --- core/js/js.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index c1713539f4f..699c2667bdc 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1617,14 +1617,27 @@ function initCore() { maxPosition: 250, minDragDistance: 100 }); - $('#app-content').prepend(''); - $('#app-navigation-toggle').click(function(){ + + $('#app-content').prepend(''); + + var toggleSnapperOnButton = function(){ if(snapper.state().state == 'left'){ snapper.close(); } else { snapper.open('left'); } + }; + + $('#app-navigation-toggle').click(function(){ + toggleSnapperOnButton(); + }); + + $('#app-navigation-toggle').keypress(function(e) { + if(e.which == 13) { + toggleSnapperOnButton(); + } }); + // close sidebar when switching navigation entry var $appNavigation = $('#app-navigation'); $appNavigation.delegate('a, :button', 'click', function(event) { -- cgit v1.2.3 From 7f0d60fefcab33c5ed52e1cf338277397f63149e Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Fri, 20 Jul 2018 20:51:23 +0200 Subject: Enter key on menu registration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/js/js.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index 699c2667bdc..015517020b4 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -684,10 +684,15 @@ var OCP = {}, registerMenu: function($toggle, $menuEl, toggle, headerMenu) { var self = this; $menuEl.addClass('menu'); - $toggle.on('click.menu', function(event) { + $toggle.on('click.menu keypress.menu', function(event) { // prevent the link event (append anchor to URL) event.preventDefault(); + // allow enter key as a trigger + if (event.keyCode && event.keyCode !== 13) { + return; + } + if ($menuEl.is(OC._currentMenu)) { self.hideMenus(); return; @@ -1422,7 +1427,14 @@ function initCore() { OC.registerMenu($('#expand'), $('#expanddiv'), false, true); // toggle for menus + //$(document).on('mouseup.closemenus keyup', function(event) { $(document).on('mouseup.closemenus', function(event) { + + // allow enter as a trigger + // if (event.keyCode && event.keyCode !== 13) { + // return; + // } + var $el = $(event.target); if ($el.closest('.menu').length || $el.closest('.menutoggle').length) { // don't close when clicking on the menu directly or a menu toggle -- cgit v1.2.3 From fe2509231213409238c8243c8211bcab0bc4a00b Mon Sep 17 00:00:00 2001 From: Kevin Ndung'u Date: Mon, 23 Jul 2018 11:17:32 +0300 Subject: Remove deprecated keyboard events & properties Signed-off-by: Kevin Ndung'u --- core/js/js.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/js') diff --git a/core/js/js.js b/core/js/js.js index 015517020b4..5b5ff6bf3f1 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -684,12 +684,12 @@ var OCP = {}, registerMenu: function($toggle, $menuEl, toggle, headerMenu) { var self = this; $menuEl.addClass('menu'); - $toggle.on('click.menu keypress.menu', function(event) { + $toggle.on('click.menu keyup.menu', function(event) { // prevent the link event (append anchor to URL) event.preventDefault(); // allow enter key as a trigger - if (event.keyCode && event.keyCode !== 13) { + if (event.key && event.key !== "Enter") { return; } @@ -1431,7 +1431,7 @@ function initCore() { $(document).on('mouseup.closemenus', function(event) { // allow enter as a trigger - // if (event.keyCode && event.keyCode !== 13) { + // if (event.key && event.key !== "Enter") { // return; // } -- cgit v1.2.3