foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-28 09:21:13 -05:00
Code Issues Wiki Activity

Forbid jQuery is and fix issues (#30016)

Browse source 
Tested all functionality.

---------

Co-authored-by: Yarden Shoham <git@yardenshoham.com>
(cherry picked from commit 0a2f973de9b681a472c96bdfcd945978e88458d8)
This commit is contained in:
silverwind 2024-03-24 18:56:02 +01:00 committed by Earl Warren
parent c5eae64e06
commit e28f4328b3
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.eslintrc.yaml
View file

@ -303,7 +303,7 @@ rules:
jquery/no-in-array: [2] jquery/no-in-array: [2]
jquery/no-is-array: [2] jquery/no-is-array: [2]
jquery/no-is-function: [2] jquery/no-is-function: [2]
jquery/no-is: [0] jquery/no-is: [2]
jquery/no-load: [2] jquery/no-load: [2]
jquery/no-map: [2] jquery/no-map: [2]
jquery/no-merge: [2] jquery/no-merge: [2]
@ -440,7 +440,7 @@ rules:
no-jquery/no-is-numeric: [2] no-jquery/no-is-numeric: [2]
no-jquery/no-is-plain-object: [2] no-jquery/no-is-plain-object: [2]
no-jquery/no-is-window: [2] no-jquery/no-is-window: [2]
no-jquery/no-is: [0] no-jquery/no-is: [2]
no-jquery/no-jquery-constructor: [0] no-jquery/no-jquery-constructor: [0]
no-jquery/no-live: [2] no-jquery/no-live: [2]
no-jquery/no-load-shorthand: [2] no-jquery/no-load-shorthand: [2]

4
web_src/js/features/admin/common.js
View file

@ -84,7 +84,7 @@ export function initAdminCommon() {
hideElem($('.oauth2_use_custom_url_field')); hideElem($('.oauth2_use_custom_url_field'));
$('.oauth2_use_custom_url_field input[required]').removeAttr('required'); $('.oauth2_use_custom_url_field input[required]').removeAttr('required');
if ($('#oauth2_use_custom_url').is(':checked')) { if (document.getElementById('oauth2_use_custom_url')?.checked) {
for (const custom of ['token_url', 'auth_url', 'profile_url', 'email_url', 'tenant']) { for (const custom of ['token_url', 'auth_url', 'profile_url', 'email_url', 'tenant']) {
if (applyDefaultValues) { if (applyDefaultValues) {
$(`#oauth2_${custom}`).val($(`#${provider}_${custom}`).val()); $(`#oauth2_${custom}`).val($(`#${provider}_${custom}`).val());
@ -98,7 +98,7 @@ export function initAdminCommon() {
} }
function onEnableLdapGroupsChange() { function onEnableLdapGroupsChange() {
toggleElem($('#ldap-group-options'), $('.js-ldap-group-toggle').is(':checked')); toggleElem($('#ldap-group-options'), $('.js-ldap-group-toggle')[0].checked);
} }
// New authentication // New authentication

2
web_src/js/features/common-global.js
View file

@ -373,7 +373,7 @@ function initGlobalShowModal() {
if (attrTargetAttr) { if (attrTargetAttr) {
$attrTarget[0][attrTargetAttr] = attrib.value; $attrTarget[0][attrTargetAttr] = attrib.value;
} else if ($attrTarget.is('input') || $attrTarget.is('textarea')) { } else if ($attrTarget[0].matches('input, textarea')) {
$attrTarget.val(attrib.value); // FIXME: add more supports like checkbox $attrTarget.val(attrib.value); // FIXME: add more supports like checkbox
} else { } else {
$attrTarget.text(attrib.value); // FIXME: it should be more strict here, only handle div/span/p $attrTarget.text(attrib.value); // FIXME: it should be more strict here, only handle div/span/p

6
web_src/js/features/repo-legacy.js
View file

@ -139,7 +139,7 @@ export function initRepoCommentForm() {
hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var
const $clickedItem = $(this); const clickedItem = this; // eslint-disable-line unicorn/no-this-assignment
const scope = $(this).attr('data-scope'); const scope = $(this).attr('data-scope');
$(this).parent().find('.item').each(function () { $(this).parent().find('.item').each(function () {
@ -148,10 +148,10 @@ export function initRepoCommentForm() {
if ($(this).attr('data-scope') !== scope) { if ($(this).attr('data-scope') !== scope) {
return true; return true;
} }
if (!$(this).is($clickedItem) && !$(this).hasClass('checked')) { if (this !== clickedItem && !$(this).hasClass('checked')) {
return true; return true;
} }
} else if (!$(this).is($clickedItem)) { } else if (this !== clickedItem) {
// Toggle for other labels // Toggle for other labels
return true; return true;
} }

2
web_src/js/modules/fomantic/dropdown.js
View file

@ -199,7 +199,7 @@ function attachDomEvents($dropdown, $focusable, $menu) {
if (!$item) $item = $menu.find('> .item.selected'); // when dropdown filters items by input, there is no "value", so query the "selected" item if (!$item) $item = $menu.find('> .item.selected'); // when dropdown filters items by input, there is no "value", so query the "selected" item
// if the selected item is clickable, then trigger the click event. // if the selected item is clickable, then trigger the click event.
// we can not click any item without check, because Fomantic code might also handle the Enter event. that would result in double click. // we can not click any item without check, because Fomantic code might also handle the Enter event. that would result in double click.
if ($item && ($item.is('a') || $item.hasClass('js-aria-clickable'))) $item[0].click(); if ($item && ($item[0].matches('a') || $item.hasClass('js-aria-clickable'))) $item[0].click();
} }
}); });