Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove jQuery calls that have no effect on showElem and hideElem (#30110)

Browse source 
There's no need to initialize a jQuery object with a CSS selector when
we can pass the CSS selector directly.

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
(cherry picked from commit a1f11e2e33f20409eac65b2d0e9a7cd7c767eb72)
This commit is contained in:
Yarden Shoham 2024-03-26 21:38:37 +02:00 committed by Earl Warren
parent 7e0dfa07ba
commit 95024f1486
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,8 +17,8 @@ export function initAdminCommon() {
if ($(this).val().substring(0, 1) === '0') { if ($(this).val().substring(0, 1) === '0') {
$('#user_name').removeAttr('disabled'); $('#user_name').removeAttr('disabled');
$('#login_name').removeAttr('required'); $('#login_name').removeAttr('required');
hideElem($('.non-local')); hideElem('.non-local');
showElem($('.local')); showElem('.local');
$('#user_name').trigger('focus'); $('#user_name').trigger('focus');
if ($(this).data('password') === 'required') { if ($(this).data('password') === 'required') {
@ -29,8 +29,8 @@ export function initAdminCommon() {
$('#user_name').attr('disabled', 'disabled'); $('#user_name').attr('disabled', 'disabled');
} }
$('#login_name').attr('required', 'required'); $('#login_name').attr('required', 'required');
showElem($('.non-local')); showElem('.non-local');
hideElem($('.local')); hideElem('.local');
$('#login_name').trigger('focus'); $('#login_name').trigger('focus');
$('#password').removeAttr('required'); $('#password').removeAttr('required');
@ -40,9 +40,9 @@ export function initAdminCommon() {
function onSecurityProtocolChange() { function onSecurityProtocolChange() {
if ($('#security_protocol').val() > 0) { if ($('#security_protocol').val() > 0) {
showElem($('.has-tls')); showElem('.has-tls');
} else { } else {
hideElem($('.has-tls')); hideElem('.has-tls');
} }
} }
@ -57,21 +57,21 @@ export function initAdminCommon() {
} }
function onOAuth2Change(applyDefaultValues) { function onOAuth2Change(applyDefaultValues) {
hideElem($('.open_id_connect_auto_discovery_url, .oauth2_use_custom_url')); hideElem('.open_id_connect_auto_discovery_url, .oauth2_use_custom_url');
$('.open_id_connect_auto_discovery_url input[required]').removeAttr('required'); $('.open_id_connect_auto_discovery_url input[required]').removeAttr('required');
const provider = $('#oauth2_provider').val(); const provider = $('#oauth2_provider').val();
switch (provider) { switch (provider) {
case 'openidConnect': case 'openidConnect':
$('.open_id_connect_auto_discovery_url input').attr('required', 'required'); $('.open_id_connect_auto_discovery_url input').attr('required', 'required');
showElem($('.open_id_connect_auto_discovery_url')); showElem('.open_id_connect_auto_discovery_url');
break; break;
default: default:
if ($(`#${provider}_customURLSettings`).data('required')) { if ($(`#${provider}_customURLSettings`).data('required')) {
$('#oauth2_use_custom_url').attr('checked', 'checked'); $('#oauth2_use_custom_url').attr('checked', 'checked');
} }
if ($(`#${provider}_customURLSettings`).data('available')) { if ($(`#${provider}_customURLSettings`).data('available')) {
showElem($('.oauth2_use_custom_url')); showElem('.oauth2_use_custom_url');
} }
} }
onOAuth2UseCustomURLChange(applyDefaultValues); onOAuth2UseCustomURLChange(applyDefaultValues);
@ -79,7 +79,7 @@ export function initAdminCommon() {
function onOAuth2UseCustomURLChange(applyDefaultValues) { function onOAuth2UseCustomURLChange(applyDefaultValues) {
const provider = $('#oauth2_provider').val(); const provider = $('#oauth2_provider').val();
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 (document.getElementById('oauth2_use_custom_url')?.checked) { if (document.getElementById('oauth2_use_custom_url')?.checked) {
@ -102,7 +102,7 @@ export function initAdminCommon() {
// New authentication // New authentication
if ($('.admin.new.authentication').length > 0) { if ($('.admin.new.authentication').length > 0) {
$('#auth_type').on('change', function () { $('#auth_type').on('change', function () {
hideElem($('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls, .search-page-size, .sspi')); hideElem('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls, .search-page-size, .sspi');
$('.ldap input[required], .binddnrequired input[required], .dldap input[required], .smtp input[required], .pam input[required], .oauth2 input[required], .has-tls input[required], .sspi input[required]').removeAttr('required'); $('.ldap input[required], .binddnrequired input[required], .dldap input[required], .smtp input[required], .pam input[required], .oauth2 input[required], .has-tls input[required], .sspi input[required]').removeAttr('required');
$('.binddnrequired').removeClass('required'); $('.binddnrequired').removeClass('required');
@ -110,30 +110,30 @@ export function initAdminCommon() {
const authType = $(this).val(); const authType = $(this).val();
switch (authType) { switch (authType) {
case '2': // LDAP case '2': // LDAP
showElem($('.ldap')); showElem('.ldap');
$('.binddnrequired input, .ldap div.required:not(.dldap) input').attr('required', 'required'); $('.binddnrequired input, .ldap div.required:not(.dldap) input').attr('required', 'required');
$('.binddnrequired').addClass('required'); $('.binddnrequired').addClass('required');
break; break;
case '3': // SMTP case '3': // SMTP
showElem($('.smtp')); showElem('.smtp');
showElem($('.has-tls')); showElem('.has-tls');
$('.smtp div.required input, .has-tls').attr('required', 'required'); $('.smtp div.required input, .has-tls').attr('required', 'required');
break; break;
case '4': // PAM case '4': // PAM
showElem($('.pam')); showElem('.pam');
$('.pam input').attr('required', 'required'); $('.pam input').attr('required', 'required');
break; break;
case '5': // LDAP case '5': // LDAP
showElem($('.dldap')); showElem('.dldap');
$('.dldap div.required:not(.ldap) input').attr('required', 'required'); $('.dldap div.required:not(.ldap) input').attr('required', 'required');
break; break;
case '6': // OAuth2 case '6': // OAuth2
showElem($('.oauth2')); showElem('.oauth2');
$('.oauth2 div.required:not(.oauth2_use_custom_url,.oauth2_use_custom_url_field,.open_id_connect_auto_discovery_url) input').attr('required', 'required'); $('.oauth2 div.required:not(.oauth2_use_custom_url,.oauth2_use_custom_url_field,.open_id_connect_auto_discovery_url) input').attr('required', 'required');
onOAuth2Change(true); onOAuth2Change(true);
break; break;
case '7': // SSPI case '7': // SSPI
showElem($('.sspi')); showElem('.sspi');
$('.sspi div.required input').attr('required', 'required'); $('.sspi div.required input').attr('required', 'required');
break; break;
} }

4
web_src/js/features/org-team.js
View file

@ -8,9 +8,9 @@ export function initOrgTeamSettings() {
$('.organization.new.team input[name=permission]').on('change', () => { $('.organization.new.team input[name=permission]').on('change', () => {
const val = $('input[name=permission]:checked', '.organization.new.team').val(); const val = $('input[name=permission]:checked', '.organization.new.team').val();
if (val === 'admin') { if (val === 'admin') {
hideElem($('.organization.new.team .team-units')); hideElem('.organization.new.team .team-units');
} else { } else {
showElem($('.organization.new.team .team-units')); showElem('.organization.new.team .team-units');
} }
}); });
} }

4
web_src/js/features/repo-editor.js
View file

@ -64,10 +64,10 @@ export function initRepoEditor() {
$('.js-quick-pull-choice-option').on('change', function () { $('.js-quick-pull-choice-option').on('change', function () {
if ($(this).val() === 'commit-to-new-branch') { if ($(this).val() === 'commit-to-new-branch') {
showElem($('.quick-pull-branch-name')); showElem('.quick-pull-branch-name');
document.querySelector('.quick-pull-branch-name input').required = true; document.querySelector('.quick-pull-branch-name input').required = true;
} else { } else {
hideElem($('.quick-pull-branch-name')); hideElem('.quick-pull-branch-name');
document.querySelector('.quick-pull-branch-name input').required = false; document.querySelector('.quick-pull-branch-name input').required = false;
} }
$('#commit-button').text(this.getAttribute('button_text')); $('#commit-button').text(this.getAttribute('button_text'));