From bc31bf2d096d8c4e65c1ef75c0294699040bd91f Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Sat, 23 Mar 2024 01:17:28 +0200 Subject: [PATCH] Remove jQuery from the citation modal (except fomantic) (#30008) - Switched to plain JavaScript - Tested the citation modal functionality and it works as before # Demo using JavaScript without jQuery ![demo](https://github.com/go-gitea/gitea/assets/20454870/65bba1eb-dd4c-477f-8a2d-08e65f1e9f42) --------- Signed-off-by: Yarden Shoham Co-authored-by: silverwind (cherry picked from commit dade40407e333fbc6811bdd738c3d191b5dc0ef1) --- web_src/js/features/citation.js | 40 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/web_src/js/features/citation.js b/web_src/js/features/citation.js index 49992b225f..918a467136 100644 --- a/web_src/js/features/citation.js +++ b/web_src/js/features/citation.js @@ -1,8 +1,9 @@ import $ from 'jquery'; +import {getCurrentLocale} from '../utils.js'; const {pageData} = window.config; -async function initInputCitationValue($citationCopyApa, $citationCopyBibtex) { +async function initInputCitationValue(citationCopyApa, citationCopyBibtex) { const [{Cite, plugins}] = await Promise.all([ import(/* webpackChunkName: "citation-js-core" */'@citation-js/core'), import(/* webpackChunkName: "citation-js-formats" */'@citation-js/plugin-software-formats'), @@ -14,11 +15,11 @@ async function initInputCitationValue($citationCopyApa, $citationCopyBibtex) { config.constants.fieldTypes.doi = ['field', 'literal']; config.constants.fieldTypes.version = ['field', 'literal']; const citationFormatter = new Cite(citationFileContent); - const lang = document.documentElement.lang || 'en-US'; + const lang = getCurrentLocale() || 'en-US'; const apaOutput = citationFormatter.format('bibliography', {template: 'apa', lang}); const bibtexOutput = citationFormatter.format('bibtex', {lang}); - $citationCopyBibtex.attr('data-text', bibtexOutput); - $citationCopyApa.attr('data-text', apaOutput); + citationCopyBibtex.setAttribute('data-text', bibtexOutput); + citationCopyApa.setAttribute('data-text', apaOutput); } export async function initCitationFileCopyContent() { @@ -26,44 +27,45 @@ export async function initCitationFileCopyContent() { if (!pageData.citationFileContent) return; - const $citationCopyApa = $('#citation-copy-apa'); - const $citationCopyBibtex = $('#citation-copy-bibtex'); - const $inputContent = $('#citation-copy-content'); + const citationCopyApa = document.getElementById('citation-copy-apa'); + const citationCopyBibtex = document.getElementById('citation-copy-bibtex'); + const inputContent = document.getElementById('citation-copy-content'); + + if ((!citationCopyApa && !citationCopyBibtex) || !inputContent) return; - if ((!$citationCopyApa.length && !$citationCopyBibtex.length) || !$inputContent.length) return; const updateUi = () => { const isBibtex = (localStorage.getItem('citation-copy-format') || defaultCitationFormat) === 'bibtex'; - const copyContent = (isBibtex ? $citationCopyBibtex : $citationCopyApa).attr('data-text'); - - $inputContent.val(copyContent); - $citationCopyBibtex.toggleClass('primary', isBibtex); - $citationCopyApa.toggleClass('primary', !isBibtex); + const copyContent = (isBibtex ? citationCopyBibtex : citationCopyApa).getAttribute('data-text'); + inputContent.value = copyContent; + citationCopyBibtex.classList.toggle('primary', isBibtex); + citationCopyApa.classList.toggle('primary', !isBibtex); }; - $('#cite-repo-button').on('click', async (e) => { + document.getElementById('cite-repo-button')?.addEventListener('click', async (e) => { const dropdownBtn = e.target.closest('.ui.dropdown.button'); dropdownBtn.classList.add('is-loading'); try { try { - await initInputCitationValue($citationCopyApa, $citationCopyBibtex); + await initInputCitationValue(citationCopyApa, citationCopyBibtex); } catch (e) { console.error(`initCitationFileCopyContent error: ${e}`, e); return; } updateUi(); - $citationCopyApa.on('click', () => { + citationCopyApa.addEventListener('click', () => { localStorage.setItem('citation-copy-format', 'apa'); updateUi(); }); - $citationCopyBibtex.on('click', () => { + + citationCopyBibtex.addEventListener('click', () => { localStorage.setItem('citation-copy-format', 'bibtex'); updateUi(); }); - $inputContent.on('click', () => { - $inputContent.trigger('select'); + inputContent.addEventListener('click', () => { + inputContent.select(); }); } finally { dropdownBtn.classList.remove('is-loading');