mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-27 04:06:10 +01:00
d4f35bd681
This PR follows #22599 and #23450 The major improvements: 1. The `aria-*.js` are totally transparent now, no need to call `attachDropdownAria` explicitly anymore. * It hooks the `$.fn.checkbox` and `$.fn.dropdown`, then our patch works. * It makes all dynamically generated checkbox/dropdown work with a11y without any change * eg: the `conversation.find('.dropdown').dropdown();` in `repo-diff.js` 2. Since it's totally transparent now, it could be easier to modify or remove in the future. 3. It handles all selection labels as well (by onLabelCreate), so it supports "multiple selection dropdown" now. * It partially completes one of my TODOs: `TODO: multiple selection is not supported yet.` 4. The code structure is clearer, code blocks are splitted into different functions. * The old `attachOneDropdownAria` was splitted into separate functions. * It makes it easier to add more fine tunes in the future, and co-work with contributors. 6. The code logic is similar as before, only two new parts: 1. the `ariaCheckboxFn` and `ariaDropdownFn` functions 2. the `onLabelCreate` and `updateSelectionLabel` functions In `aria-dropdown.js` I had to mix jQuery and Vanilla JS somewhat, I think the code is still understandable, otherwise the code would be much more complex to read. Thanks to fsologureng for the idea about "improving the 'delete icon' with aria attributes". If there is anything unclear or incorrect, feel free to ask and discuss, or propose new PRs for it.
39 lines
1.4 KiB
JavaScript
39 lines
1.4 KiB
JavaScript
import $ from 'jquery';
|
|
import {generateAriaId} from './base.js';
|
|
|
|
const ariaPatchKey = '_giteaAriaPatchCheckbox';
|
|
const fomanticCheckboxFn = $.fn.checkbox;
|
|
|
|
// use our own `$.fn.checkbox` to patch Fomantic's checkbox module
|
|
export function initAriaCheckboxPatch() {
|
|
if ($.fn.checkbox === ariaCheckboxFn) throw new Error('initAriaCheckboxPatch could only be called once');
|
|
$.fn.checkbox = ariaCheckboxFn;
|
|
ariaCheckboxFn.settings = fomanticCheckboxFn.settings;
|
|
}
|
|
|
|
// the patched `$.fn.checkbox` checkbox function
|
|
// * it does the one-time attaching on the first call
|
|
function ariaCheckboxFn(...args) {
|
|
const ret = fomanticCheckboxFn.apply(this, args);
|
|
for (const el of this) {
|
|
if (el[ariaPatchKey]) continue;
|
|
attachInit(el);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
function attachInit(el) {
|
|
// Fomantic UI checkbox needs to be something like: <div class="ui checkbox"><label /><input /></div>
|
|
// It doesn't work well with <label><input />...</label>
|
|
// To make it work with aria, the "id"/"for" attributes are necessary, so add them automatically if missing.
|
|
// In the future, refactor to use native checkbox directly, then this patch could be removed.
|
|
el[ariaPatchKey] = {}; // record that this element has been patched
|
|
const label = el.querySelector('label');
|
|
const input = el.querySelector('input');
|
|
if (!label || !input || input.getAttribute('id')) return;
|
|
|
|
const id = generateAriaId();
|
|
input.setAttribute('id', id);
|
|
label.setAttribute('for', id);
|
|
}
|