Project

General

Profile

Feature #43259 » 0003-wiki-toolbar-return-focus-after-escape.patch

Florian Walchshofer, 2026-10-30 21:58

View differences:

app/javascript/controllers/wiki_toolbar_controller.js
// Menus
closeMenuWithKeyboard() {
const button = this.menuButton
this.closeMenu()
button?.focus()
}
toggleMenu({ currentTarget, params }) {
const opened = this.menu?.dataset.name === params.menu
this.closeMenu()
......
const template = this[`${params.menu}MenuTarget`]
this.menu = template.content.firstElementChild.cloneNode(true)
this.menu.dataset.name = params.menu
this.menuButton = currentTarget
this.element.append(this.menu)
this.positionMenu(currentTarget)
lib/redmine/wiki_toolbar.rb
def precode_menu
tag.ul(class: 'jstMenu', role: 'menu',
data: {action: 'click->wiki-toolbar#closeMenu keydown.esc->wiki-toolbar#closeMenu'}) do
data: {action: 'click->wiki-toolbar#closeMenu keydown.esc->wiki-toolbar#closeMenuWithKeyboard'}) do
@view.safe_join(
code_languages.map do |lang|
tag.li(role: 'none') do
......
def table_menu
tag.table(class: 'table-generator', role: 'grid',
data: {
action: 'click->wiki-toolbar#closeMenu keydown.esc->wiki-toolbar#closeMenu ' \
action: 'click->wiki-toolbar#closeMenu keydown.esc->wiki-toolbar#closeMenuWithKeyboard ' \
'mouseover->wiki-toolbar#highlightTable focusin->wiki-toolbar#highlightTable'
}) do
@view.safe_join(
(7-7/13)