From 668492f2928a2234f1dc53b335f38060a2943e89 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Sat, 17 Feb 2024 13:12:19 +0000 Subject: [PATCH 1/2] Remove jQuery from "link account" page - Switched to plain JavaScript Signed-off-by: Yarden Shoham --- web_src/js/features/user-auth.js | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/web_src/js/features/user-auth.js b/web_src/js/features/user-auth.js index af380dcfc7c86..753d3bb1d57b6 100644 --- a/web_src/js/features/user-auth.js +++ b/web_src/js/features/user-auth.js @@ -1,4 +1,3 @@ -import $ from 'jquery'; import {checkAppUrl} from './common-global.js'; export function initUserAuthOauth2() { @@ -23,28 +22,29 @@ export function initUserAuthOauth2() { } export function initUserAuthLinkAccountView() { - const $lnkUserPage = $('.page-content.user.link-account'); - if ($lnkUserPage.length === 0) { + const lnkUserPage = document.querySelector('.page-content.user.link-account'); + if (!lnkUserPage) { return false; } - const $signinTab = $lnkUserPage.find('.item[data-tab="auth-link-signin-tab"]'); - const $signUpTab = $lnkUserPage.find('.item[data-tab="auth-link-signup-tab"]'); - const $signInView = $lnkUserPage.find('.tab[data-tab="auth-link-signin-tab"]'); - const $signUpView = $lnkUserPage.find('.tab[data-tab="auth-link-signup-tab"]'); + const signinTab = lnkUserPage.querySelector('.item[data-tab="auth-link-signin-tab"]'); + const signUpTab = lnkUserPage.querySelector('.item[data-tab="auth-link-signup-tab"]'); + const signInView = lnkUserPage.querySelector('.tab[data-tab="auth-link-signin-tab"]'); + const signUpView = lnkUserPage.querySelector('.tab[data-tab="auth-link-signup-tab"]'); - $signUpTab.on('click', () => { - $signinTab.removeClass('active'); - $signInView.removeClass('active'); - $signUpTab.addClass('active'); - $signUpView.addClass('active'); - return false; + signUpTab.addEventListener('click', (e) => { + e.preventDefault(); + e.stopPropagation(); + signinTab.classList.remove('active'); + signInView.classList.remove('active'); + signUpTab.classList.add('active'); + signUpView.classList.add('active'); }); - $signinTab.on('click', () => { - $signUpTab.removeClass('active'); - $signUpView.removeClass('active'); - $signinTab.addClass('active'); - $signInView.addClass('active'); + signinTab.addEventListener('click', () => { + signUpTab.classList.remove('active'); + signUpView.classList.remove('active'); + signinTab.classList.add('active'); + signInView.classList.add('active'); }); } From 28c31729747ce70509a1dd6fb32f78ea864a95f6 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 18 Feb 2024 00:30:28 +0800 Subject: [PATCH 2/2] remove initUserAuthLinkAccountView --- web_src/js/features/user-auth.js | 28 ---------------------------- web_src/js/index.js | 3 +-- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/web_src/js/features/user-auth.js b/web_src/js/features/user-auth.js index 753d3bb1d57b6..60d186e699798 100644 --- a/web_src/js/features/user-auth.js +++ b/web_src/js/features/user-auth.js @@ -20,31 +20,3 @@ export function initUserAuthOauth2() { }); } } - -export function initUserAuthLinkAccountView() { - const lnkUserPage = document.querySelector('.page-content.user.link-account'); - if (!lnkUserPage) { - return false; - } - - const signinTab = lnkUserPage.querySelector('.item[data-tab="auth-link-signin-tab"]'); - const signUpTab = lnkUserPage.querySelector('.item[data-tab="auth-link-signup-tab"]'); - const signInView = lnkUserPage.querySelector('.tab[data-tab="auth-link-signin-tab"]'); - const signUpView = lnkUserPage.querySelector('.tab[data-tab="auth-link-signup-tab"]'); - - signUpTab.addEventListener('click', (e) => { - e.preventDefault(); - e.stopPropagation(); - signinTab.classList.remove('active'); - signInView.classList.remove('active'); - signUpTab.classList.add('active'); - signUpView.classList.add('active'); - }); - - signinTab.addEventListener('click', () => { - signUpTab.classList.remove('active'); - signUpView.classList.remove('active'); - signinTab.classList.add('active'); - signInView.classList.add('active'); - }); -} diff --git a/web_src/js/index.js b/web_src/js/index.js index 078f9fc9df415..117279c3c4a82 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -23,7 +23,7 @@ import {initFindFileInRepo} from './features/repo-findfile.js'; import {initCommentContent, initMarkupContent} from './markup/content.js'; import {initPdfViewer} from './render/pdf.js'; -import {initUserAuthLinkAccountView, initUserAuthOauth2} from './features/user-auth.js'; +import {initUserAuthOauth2} from './features/user-auth.js'; import { initRepoIssueDue, initRepoIssueReferenceRepositorySearch, @@ -178,7 +178,6 @@ onDomReady(() => { initCommitStatuses(); initCaptcha(); - initUserAuthLinkAccountView(); initUserAuthOauth2(); initUserAuthWebAuthn(); initUserAuthWebAuthnRegister();