From 258bebbb2189a48e5ca06062ecd3dc1227519feb Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 19 Feb 2024 23:21:36 +0100 Subject: [PATCH 1/2] Remove jQuery.map and enable eslint rules for it --- .eslintrc.yaml | 6 +++--- web_src/js/features/repo-commit.js | 16 +++++++--------- web_src/js/features/repo-legacy.js | 9 +++------ 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.eslintrc.yaml b/.eslintrc.yaml index ab9c218849db..e9991c02baed 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -296,7 +296,7 @@ rules: jquery/no-delegate: [2] jquery/no-each: [0] jquery/no-extend: [2] - jquery/no-fade: [0] + jquery/no-fade: [2] jquery/no-filter: [0] jquery/no-find: [0] jquery/no-global-eval: [2] @@ -309,7 +309,7 @@ rules: jquery/no-is-function: [2] jquery/no-is: [0] jquery/no-load: [2] - jquery/no-map: [0] + jquery/no-map: [2] jquery/no-merge: [2] jquery/no-param: [2] jquery/no-parent: [0] @@ -451,7 +451,7 @@ rules: no-jquery/no-load: [2] no-jquery/no-map-collection: [0] no-jquery/no-map-util: [2] - no-jquery/no-map: [0] + no-jquery/no-map: [2] no-jquery/no-merge: [2] no-jquery/no-node-name: [2] no-jquery/no-noop: [2] diff --git a/web_src/js/features/repo-commit.js b/web_src/js/features/repo-commit.js index 76b34d207771..4c75c8685f1c 100644 --- a/web_src/js/features/repo-commit.js +++ b/web_src/js/features/repo-commit.js @@ -15,16 +15,14 @@ export function initRepoEllipsisButton() { export function initRepoCommitLastCommitLoader() { const entryMap = {}; + const entries = []; + const notReadyEls = document.querySelectorAll('table#repo-files-table tr.notready'); + if (!notReadyEls.length) return; - const entries = $('table#repo-files-table tr.notready') - .map((_, v) => { - entryMap[$(v).attr('data-entryname')] = $(v); - return $(v).attr('data-entryname'); - }) - .get(); - - if (entries.length === 0) { - return; + for (const el of notReadyEls) { + const entryname = el.getAttribute('data-entryname'); + entryMap[entryname] = $(el); + entries.push(entryname); } const lastCommitLoaderURL = $('table#repo-files-table').data('lastCommitLoaderUrl'); diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index ce1bff11a2f5..10ad83679733 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -398,17 +398,14 @@ async function onEditContent(event) { } }; - const saveAndRefresh = (dz, $dropzone) => { + const saveAndRefresh = (dz) => { showElem($renderContent); hideElem($editContentZone); - const $attachments = $dropzone.find('.files').find('[name=files]').map(function () { - return $(this).val(); - }).get(); $.post($editContentZone.attr('data-update-url'), { _csrf: csrfToken, content: comboMarkdownEditor.value(), context: $editContentZone.attr('data-context'), - files: $attachments, + files: dz.files.map((file) => file.uuid), }, (data) => { if (!data.content) { $renderContent.html($('#no-content').html()); @@ -452,7 +449,7 @@ async function onEditContent(event) { }); $editContentZone.find('.save.button').on('click', (e) => { e.preventDefault(); - saveAndRefresh(dz, $dropzone); + saveAndRefresh(dz); }); } else { comboMarkdownEditor = getComboMarkdownEditor($editContentZone.find('.combo-markdown-editor')); From 7c5421bdd862ad13a892dbc5d37548856769b518 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 20 Feb 2024 17:15:44 +0100 Subject: [PATCH 2/2] move variables --- web_src/js/features/repo-commit.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/features/repo-commit.js b/web_src/js/features/repo-commit.js index 4c75c8685f1c..fc70ba41e4c3 100644 --- a/web_src/js/features/repo-commit.js +++ b/web_src/js/features/repo-commit.js @@ -14,11 +14,11 @@ export function initRepoEllipsisButton() { } export function initRepoCommitLastCommitLoader() { - const entryMap = {}; - const entries = []; const notReadyEls = document.querySelectorAll('table#repo-files-table tr.notready'); if (!notReadyEls.length) return; + const entryMap = {}; + const entries = []; for (const el of notReadyEls) { const entryname = el.getAttribute('data-entryname'); entryMap[entryname] = $(el);