NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-08 18:04:14 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

Fix unclickable checkboxes (#30195) (#30199)

Browse source 
Backport #30195 by @silverwind

Fix https://github.com/go-gitea/gitea/issues/30185, regression from
https://github.com/go-gitea/gitea/pull/30162.

The checkboxes were unclickable because the label was positioned over
the checkbox with `padding`. Now it uses `margin` so the checkbox itself
will be clickable in all cases.

Secondly, I changed the for/id linking to also add missing `for`
attributes when `id` is present. The other way around (only `for`
present) is currently not handled and I think there are likey no
occurences in the code and introducing new non-generated `id`s might
cause problems elsewhere if we do, so I skipped on that.

Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 9d38c4d60ef5bd015e1430386e38d9f32e050f8f)
This commit is contained in:
Giteabot 2024-03-31 08:05:52 +08:00 committed by Earl Warren
parent f4a2f439a9
commit d573c22a98
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web_src/css/modules/checkbox.css
View file

@ -41,7 +41,7 @@ input[type="radio"] {
.ui.checkbox label, .ui.checkbox label,
.ui.radio.checkbox label { .ui.radio.checkbox label {
padding-left: 1.85714em; margin-left: 1.85714em;
} }
.ui.checkbox + label { .ui.checkbox + label {

17
web_src/js/modules/fomantic/checkbox.js
View file

@ -6,10 +6,19 @@ export function initAriaCheckboxPatch() {
if (el.hasAttribute('data-checkbox-patched')) continue; if (el.hasAttribute('data-checkbox-patched')) continue;
const label = el.querySelector('label'); const label = el.querySelector('label');
const input = el.querySelector('input'); const input = el.querySelector('input');
if (!label || !input || input.getAttribute('id') || label.getAttribute('for')) continue; if (!label || !input) continue;
const id = generateAriaId(); const inputId = input.getAttribute('id');
input.setAttribute('id', id); const labelFor = label.getAttribute('for');
label.setAttribute('for', 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);
} else {
continue;
}
el.setAttribute('data-checkbox-patched', 'true'); el.setAttribute('data-checkbox-patched', 'true');
} }
} }