diff options
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/fileactions.js | 3 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 3 | ||||
| -rw-r--r-- | apps/files/js/navigation.js | 7 | ||||
| -rw-r--r-- | apps/files/js/newfilemenu.js | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 8790eae9c98..9b86c6521ae 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -370,6 +370,7 @@ var menu; var $trigger = context.$file.closest('tr').find('.fileactions .action-menu'); $trigger.addClass('open'); + $trigger.attr('aria-expanded', 'true'); menu = new OCA.Files.FileActionsMenu(); @@ -378,6 +379,7 @@ menu.$el.on('afterHide', function() { context.$file.removeClass('mouseOver'); $trigger.removeClass('open'); + $trigger.attr('aria-expanded', 'false'); menu.remove(); }); @@ -404,6 +406,7 @@ }, false, context); $el.addClass('permanent'); + $el.attr('aria-expanded', 'false'); }, diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 4acefa6902b..8407cb79bb3 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -3853,7 +3853,7 @@ $actionsContainer.prepend($newButton); $newButton.tooltip({'placement': 'bottom'}); - + $newButton.attr('aria-expanded', 'false'); $newButton.click(_.bind(this._onClickNewButton, this)); this._newButton = $newButton; }, @@ -3864,6 +3864,7 @@ $target = $target.closest('.button'); } this._newButton.tooltip('hide'); + $target.attr('aria-expanded', 'true'); event.preventDefault(); if ($target.hasClass('disabled')) { return false; diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js index f8f15394ef0..8a2cddb3f52 100644 --- a/apps/files/js/navigation.js +++ b/apps/files/js/navigation.js @@ -200,6 +200,13 @@ if ($menu.hasClass('collapsible') && $menu.data('expandedstate')) { $menu.toggleClass('open'); + var targetAriaExpanded = $target.attr('aria-expanded'); + if (targetAriaExpanded === 'false') { + $target.attr('aria-expanded', 'true'); + } else if (targetAriaExpanded === 'true') { + $target.attr('aria-expanded', 'false'); + } + $menu.toggleAttr('data-expanded', 'true', 'false'); var show = $menu.hasClass('open') ? 1 : 0; var key = $menu.data('expandedstate'); $.post(OC.generateUrl("/apps/files/api/v1/toggleShowFolder/" + key), {show: show}); diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js index faebc305c6d..67ca8934549 100644 --- a/apps/files/js/newfilemenu.js +++ b/apps/files/js/newfilemenu.js @@ -245,7 +245,7 @@ */ showAt: function($target) { this.render(); - OC.showMenu(null, this.$el); + OC.showMenu($target, this.$el); } }); |