mirror of
https://github.com/zulip/zulip.git
synced 2025-11-03 21:43:21 +00:00
77ce5841b9
Commit 03393631bd (#14142) regressed the
keyboard accessibility of the keyboard shortcuts modal. Fix it by
moving tabindex="0" to the scrolling element of the SimpleBar.
Fixes #14320.
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
81 lines
2.2 KiB
JavaScript
81 lines
2.2 KiB
JavaScript
// Make it explicit that our toggler is undefined until
|
|
// set_up_toggler is called.
|
|
exports.toggler = undefined;
|
|
|
|
exports.set_up_toggler = function () {
|
|
const opts = {
|
|
selected: 0,
|
|
child_wants_focus: true,
|
|
values: [
|
|
{ label: i18n.t("Keyboard shortcuts"), key: "keyboard-shortcuts" },
|
|
{ label: i18n.t("Message formatting"), key: "message-formatting" },
|
|
{ label: i18n.t("Search operators"), key: "search-operators" },
|
|
],
|
|
callback: function (name, key) {
|
|
$(".overlay-modal").hide();
|
|
$("#" + key).show();
|
|
ui.get_scroll_element($("#" + key).find(".modal-body")).focus();
|
|
},
|
|
};
|
|
|
|
exports.toggler = components.toggle(opts);
|
|
const elem = exports.toggler.get();
|
|
elem.addClass('large allow-overflow');
|
|
|
|
const modals = opts.values.map(item => {
|
|
const key = item.key; // e.g. message-formatting
|
|
const modal = $('#' + key).find('.modal-body');
|
|
return modal;
|
|
});
|
|
|
|
for (const modal of modals) {
|
|
ui.get_scroll_element(modal).prop("tabindex", 0);
|
|
keydown_util.handle({
|
|
elem: modal,
|
|
handlers: {
|
|
left_arrow: exports.toggler.maybe_go_left,
|
|
right_arrow: exports.toggler.maybe_go_right,
|
|
},
|
|
});
|
|
}
|
|
|
|
$(".informational-overlays .overlay-tabs").append(elem);
|
|
|
|
common.adjust_mac_shortcuts(".hotkeys_table .hotkey kbd");
|
|
common.adjust_mac_shortcuts("#markdown-instructions kbd");
|
|
};
|
|
|
|
exports.show = function (target) {
|
|
if (!exports.toggler) {
|
|
exports.set_up_toggler();
|
|
}
|
|
|
|
const overlay = $(".informational-overlays");
|
|
|
|
if (!overlay.hasClass("show")) {
|
|
overlays.open_overlay({
|
|
name: 'informationalOverlays',
|
|
overlay: overlay,
|
|
on_close: function () {
|
|
hashchange.changehash("");
|
|
},
|
|
});
|
|
}
|
|
|
|
if (target) {
|
|
exports.toggler.goto(target);
|
|
}
|
|
};
|
|
|
|
exports.maybe_show_keyboard_shortcuts = function () {
|
|
if (overlays.is_active()) {
|
|
return;
|
|
}
|
|
if (popovers.any_active()) {
|
|
return;
|
|
}
|
|
exports.show("keyboard-shortcuts");
|
|
};
|
|
|
|
window.info_overlay = exports;
|