mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-11 04:26:16 +01:00
2072ff75e8
Fixes: https://github.com/go-gitea/gitea/issues/30384
On repo settings page, there id `repo_name` was used 5 times on the same
page, some in modal and such. I think we are better off just
auto-generating these IDs in the future so that labels link up with
their form element.
Ideally this id generation would be done in backend in a subtemplate,
but seeing that we already have similar JS patches for checkboxes, I
took the easy path for now.
I also checked that these `#repo_name` were not in use in JS and the
only case where this id appears in JS is on the migration page where
it's still there.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
(cherry picked from commit d4ec6b3d16496ce3b479d5a08f79823122dc2b7b)
Conflicts:
- templates/repo/settings/options.tmpl
Conflict resolved by manually removing all `id` and `for`
attributes from elements that had `repo_name` as their id.
(cherry picked from commit a01387f5b1
)
18 lines
512 B
JavaScript
18 lines
512 B
JavaScript
let ariaIdCounter = 0;
|
|
|
|
export function generateAriaId() {
|
|
return `_aria_auto_id_${ariaIdCounter++}`;
|
|
}
|
|
|
|
export function linkLabelAndInput(label, input) {
|
|
const labelFor = label.getAttribute('for');
|
|
const inputId = input.getAttribute('id');
|
|
|
|
if (inputId && !labelFor) { // missing "for"
|
|
label.setAttribute('for', inputId);
|
|
} else if (!inputId && !labelFor) { // missing both "id" and "for"
|
|
const id = generateAriaId();
|
|
input.setAttribute('id', id);
|
|
label.setAttribute('for', id);
|
|
}
|
|
}
|