diff options
author | silverwind <me@silverwind.io> | 2024-03-22 15:06:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-22 14:06:53 +0000 |
commit | 3d751b6ec18e57698ce86b79866031d2c80c2071 (patch) | |
tree | 81e9ad9d8380e38acc0e3079bd99590bb420c85f /web_src/js/features | |
parent | f88ad5424f381bf2a45fd863b551c5a72891bb68 (diff) | |
download | gitea-3d751b6ec18e57698ce86b79866031d2c80c2071.tar.gz gitea-3d751b6ec18e57698ce86b79866031d2c80c2071.zip |
Enforce trailing comma in JS on multiline (#30002)
To keep blame info accurate and to avoid [changes like
this](https://github.com/go-gitea/gitea/pull/29977/files#diff-c3422631a14edbe1e508c4b22f0c718db318be08a6e889427802f9b6165d88d6R359),
it's good to always have a trailing comma, so let's enforce it in JS.
This rule is completely automatically fixable with `make lint-js-fix`
and that's what I did here.
Diffstat (limited to 'web_src/js/features')
22 files changed, 62 insertions, 62 deletions
diff --git a/web_src/js/features/captcha.js b/web_src/js/features/captcha.js index 3da5dbda41..c803a5006b 100644 --- a/web_src/js/features/captcha.js +++ b/web_src/js/features/captcha.js @@ -9,7 +9,7 @@ export async function initCaptcha() { const params = { sitekey: siteKey, - theme: isDark ? 'dark' : 'light' + theme: isDark ? 'dark' : 'light', }; switch (captchaEl.getAttribute('data-captcha-type')) { @@ -42,7 +42,7 @@ export async function initCaptcha() { siteKey: { instanceUrl: new URL(instanceURL), key: siteKey, - } + }, }); break; } diff --git a/web_src/js/features/code-frequency.js b/web_src/js/features/code-frequency.js index 103d82f6e3..47e1539ddc 100644 --- a/web_src/js/features/code-frequency.js +++ b/web_src/js/features/code-frequency.js @@ -11,7 +11,7 @@ export async function initRepoCodeFrequency() { loadingTitle: el.getAttribute('data-locale-loading-title'), loadingTitleFailed: el.getAttribute('data-locale-loading-title-failed'), loadingInfo: el.getAttribute('data-locale-loading-info'), - } + }, }); View.mount(el); } catch (err) { diff --git a/web_src/js/features/codeeditor.js b/web_src/js/features/codeeditor.js index fceb2f7620..4fb8bb9e63 100644 --- a/web_src/js/features/codeeditor.js +++ b/web_src/js/features/codeeditor.js @@ -80,7 +80,7 @@ export async function createMonaco(textarea, filename, editorOpts) { rules: [ { background: getColor('--color-code-bg'), - } + }, ], colors: { 'editor.background': getColor('--color-code-bg'), @@ -98,7 +98,7 @@ export async function createMonaco(textarea, filename, editorOpts) { 'input.foreground': getColor('--color-input-text'), 'scrollbar.shadow': getColor('--color-shadow'), 'progressBar.background': getColor('--color-primary'), - } + }, }); // Quick fix: https://github.com/microsoft/monaco-editor/issues/2962 diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index d99f606c8a..2469361c6e 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -335,7 +335,7 @@ export function initGlobalLinkActions() { const data = await response.json(); window.location.href = data.redirect; } - } + }, }).modal('show'); } diff --git a/web_src/js/features/comp/EasyMDEToolbarActions.js b/web_src/js/features/comp/EasyMDEToolbarActions.js index 8286d5d871..c97d683704 100644 --- a/web_src/js/features/comp/EasyMDEToolbarActions.js +++ b/web_src/js/features/comp/EasyMDEToolbarActions.js @@ -139,7 +139,7 @@ export function easyMDEToolbarActions(EasyMDE, editor) { }, icon: svg('octicon-chevron-right'), title: 'Add Inline Code', - } + }, }; for (const [key, value] of Object.entries(actions)) { diff --git a/web_src/js/features/comp/SearchUserBox.js b/web_src/js/features/comp/SearchUserBox.js index 541052c174..83d7044f11 100644 --- a/web_src/js/features/comp/SearchUserBox.js +++ b/web_src/js/features/comp/SearchUserBox.js @@ -22,7 +22,7 @@ export function initCompSearchUserBox() { $.each(response.data, (_i, item) => { const resultItem = { title: item.login, - image: item.avatar_url + image: item.avatar_url, }; if (item.full_name) { resultItem.description = htmlEscape(item.full_name); @@ -37,15 +37,15 @@ export function initCompSearchUserBox() { if (allowEmailInput && items.length === 0 && looksLikeEmailAddressCheck.test(searchQuery)) { const resultItem = { title: searchQuery, - description: allowEmailDescription + description: allowEmailDescription, }; items.push(resultItem); } return {results: items}; - } + }, }, searchFields: ['login', 'full_name'], - showNoResults: false + showNoResults: false, }); } diff --git a/web_src/js/features/contextpopup.js b/web_src/js/features/contextpopup.js index 51363b810a..ce90f3e505 100644 --- a/web_src/js/features/contextpopup.js +++ b/web_src/js/features/contextpopup.js @@ -37,7 +37,7 @@ export function attachRefIssueContextPopup(refIssues) { interactiveBorder: 5, onShow: () => { el.firstChild.dispatchEvent(new CustomEvent('ce-load-context-popup', {detail: {owner, repo, index}})); - } + }, }); } } diff --git a/web_src/js/features/contributors.js b/web_src/js/features/contributors.js index 66185ac315..1d9cba5b9b 100644 --- a/web_src/js/features/contributors.js +++ b/web_src/js/features/contributors.js @@ -18,7 +18,7 @@ export async function initRepoContributors() { loadingTitle: el.getAttribute('data-locale-loading-title'), loadingTitleFailed: el.getAttribute('data-locale-loading-title-failed'), loadingInfo: el.getAttribute('data-locale-loading-info'), - } + }, }); View.mount(el); } catch (err) { diff --git a/web_src/js/features/eventsource.sharedworker.js b/web_src/js/features/eventsource.sharedworker.js index 2ac7d93cc1..62581cf687 100644 --- a/web_src/js/features/eventsource.sharedworker.js +++ b/web_src/js/features/eventsource.sharedworker.js @@ -48,7 +48,7 @@ class Source { this.eventSource.addEventListener(eventType, (event) => { this.notifyClients({ type: eventType, - data: event.data + data: event.data, }); }); } diff --git a/web_src/js/features/imagediff.js b/web_src/js/features/imagediff.js index 2bac13b0bf..7b77b30ccc 100644 --- a/web_src/js/features/imagediff.js +++ b/web_src/js/features/imagediff.js @@ -20,19 +20,19 @@ function getDefaultSvgBoundsIfUndefined(text, src) { if (img.width > 1 && img.width < MaxSize && img.height > 1 && img.height < MaxSize) { return { width: img.width, - height: img.height + height: img.height, }; } if (svg.hasAttribute('viewBox')) { const viewBox = svg.viewBox.baseVal; return { width: DefaultSize, - height: DefaultSize * viewBox.width / viewBox.height + height: DefaultSize * viewBox.width / viewBox.height, }; } return { width: DefaultSize, - height: DefaultSize + height: DefaultSize, }; } return null; @@ -42,15 +42,15 @@ export function initImageDiff() { function createContext(image1, image2) { const size1 = { width: image1 && image1.width || 0, - height: image1 && image1.height || 0 + height: image1 && image1.height || 0, }; const size2 = { width: image2 && image2.width || 0, - height: image2 && image2.height || 0 + height: image2 && image2.height || 0, }; const max = { width: Math.max(size2.width, size1.width), - height: Math.max(size2.height, size1.height) + height: Math.max(size2.height, size1.height), }; return { @@ -63,8 +63,8 @@ export function initImageDiff() { Math.floor(max.width - size1.width) / 2, Math.floor(max.height - size1.height) / 2, Math.floor(max.width - size2.width) / 2, - Math.floor(max.height - size2.height) / 2 - ] + Math.floor(max.height - size2.height) / 2, + ], }; } @@ -79,12 +79,12 @@ export function initImageDiff() { path: this.getAttribute('data-path-after'), mime: this.getAttribute('data-mime-after'), $images: $container.find('img.image-after'), // matches 3 <img> - $boundsInfo: $container.find('.bounds-info-after') + $boundsInfo: $container.find('.bounds-info-after'), }, { path: this.getAttribute('data-path-before'), mime: this.getAttribute('data-mime-before'), $images: $container.find('img.image-before'), // matches 3 <img> - $boundsInfo: $container.find('.bounds-info-before') + $boundsInfo: $container.find('.bounds-info-before'), }]; await Promise.all(imageInfos.map(async (info) => { @@ -222,21 +222,21 @@ export function initImageDiff() { sizes.image1.css({ width: sizes.size1.width * factor, - height: sizes.size1.height * factor + height: sizes.size1.height * factor, }); sizes.image2.css({ width: sizes.size2.width * factor, - height: sizes.size2.height * factor + height: sizes.size2.height * factor, }); sizes.image1.parent().css({ margin: `${sizes.ratio[1] * factor}px ${sizes.ratio[0] * factor}px`, width: sizes.size1.width * factor + 2, - height: sizes.size1.height * factor + 2 + height: sizes.size1.height * factor + 2, }); sizes.image2.parent().css({ margin: `${sizes.ratio[3] * factor}px ${sizes.ratio[2] * factor}px`, width: sizes.size2.width * factor + 2, - height: sizes.size2.height * factor + 2 + height: sizes.size2.height * factor + 2, }); // some inner elements are `position: absolute`, so the container's height must be large enough @@ -248,7 +248,7 @@ export function initImageDiff() { const $range = $container.find("input[type='range']"); const onInput = () => sizes.image1.parent().css({ - opacity: $range.val() / 100 + opacity: $range.val() / 100, }); $range.on('input', onInput); onInput(); diff --git a/web_src/js/features/install.js b/web_src/js/features/install.js index 2d6d345c1d..54ba3778f8 100644 --- a/web_src/js/features/install.js +++ b/web_src/js/features/install.js @@ -19,7 +19,7 @@ function initPreInstall() { const defaultDbHosts = { mysql: '127.0.0.1:3306', postgres: '127.0.0.1:5432', - mssql: '127.0.0.1:1433' + mssql: '127.0.0.1:1433', }; const dbHost = document.getElementById('db_host'); diff --git a/web_src/js/features/org-team.js b/web_src/js/features/org-team.js index 6ae3a90f4d..2236bc58bc 100644 --- a/web_src/js/features/org-team.js +++ b/web_src/js/features/org-team.js @@ -26,14 +26,14 @@ export function initOrgTeamSearchRepoBox() { $.each(response.data, (_i, item) => { items.push({ title: item.repository.full_name.split('/')[1], - description: item.repository.full_name + description: item.repository.full_name, }); }); return {results: items}; - } + }, }, searchFields: ['full_name'], - showNoResults: false + showNoResults: false, }); } diff --git a/web_src/js/features/recent-commits.js b/web_src/js/features/recent-commits.js index ded10d39be..030c251a05 100644 --- a/web_src/js/features/recent-commits.js +++ b/web_src/js/features/recent-commits.js @@ -11,7 +11,7 @@ export async function initRepoRecentCommits() { loadingTitle: el.getAttribute('data-locale-loading-title'), loadingTitleFailed: el.getAttribute('data-locale-loading-title-failed'), loadingInfo: el.getAttribute('data-locale-loading-info'), - } + }, }); View.mount(el); } catch (err) { diff --git a/web_src/js/features/repo-code.js b/web_src/js/features/repo-code.js index c4a81ea165..08fae763b8 100644 --- a/web_src/js/features/repo-code.js +++ b/web_src/js/features/repo-code.js @@ -116,7 +116,7 @@ function showLineButton() { tippy.popper.addEventListener('click', () => { tippy.hide(); }, {once: true}); - } + }, }); } diff --git a/web_src/js/features/repo-home.js b/web_src/js/features/repo-home.js index 50f324d788..6ac7b96b9e 100644 --- a/web_src/js/features/repo-home.js +++ b/web_src/js/features/repo-home.js @@ -146,7 +146,7 @@ export function initRepoTopicBar() { addedValue = addedValue.toLowerCase().trim(); $($addedChoice).attr('data-value', addedValue); $($addedChoice).attr('data-text', addedValue); - } + }, }); $.fn.form.settings.rules.validateTopic = function (_values, regExp) { @@ -168,14 +168,14 @@ export function initRepoTopicBar() { { type: 'validateTopic', value: /^\s*[a-z0-9][-.a-z0-9]{0,35}\s*$/, - prompt: topicPrompts.formatPrompt + prompt: topicPrompts.formatPrompt, }, { type: 'maxCount[25]', - prompt: topicPrompts.countPrompt - } - ] + prompt: topicPrompts.countPrompt, + }, + ], }, - } + }, }); } diff --git a/web_src/js/features/repo-issue-content.js b/web_src/js/features/repo-issue-content.js index f67a22ea6f..33ea55f027 100644 --- a/web_src/js/features/repo-issue-content.js +++ b/web_src/js/features/repo-issue-content.js @@ -60,7 +60,7 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH }, onHide() { $(this).dropdown('clear', true); - } + }, }); $dialog.modal({ async onShow() { diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index c91dd06ac9..bf4ec15372 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -59,7 +59,7 @@ async function updateDeadline(deadlineString) { try { const response = await POST($('#update-issue-deadline-form').attr('action'), { - data: {due_date: realDeadline} + data: {due_date: realDeadline}, }); if (response.ok) { @@ -268,7 +268,7 @@ export function initRepoPullRequestUpdate() { $pullUpdateButton.find('.button-text').text($choice.text()); $pullUpdateButton.data('do', $url); } - } + }, }); } @@ -316,7 +316,7 @@ export function initRepoIssueReferenceRepositorySearch() { $.each(response.data, (_r, repo) => { filteredResponse.results.push({ name: htmlEscape(repo.repository.full_name), - value: repo.repository.full_name + value: repo.repository.full_name, }); }); return filteredResponse; @@ -327,7 +327,7 @@ export function initRepoIssueReferenceRepositorySearch() { const $form = $choice.closest('form'); $form.attr('action', `${appSubUrl}/${_text}/issues/new`); }, - fullTextSearch: true + fullTextSearch: true, }); } @@ -443,7 +443,7 @@ export function initRepoPullRequestReview() { } window.scrollTo({ top: $commentDiv.offset().top - offset, - behavior: 'instant' + behavior: 'instant', }); } } @@ -661,7 +661,7 @@ export function initRepoIssueBranchSelect() { // Replace branch name to keep translation from HTML template $selectionTextField.html($selectionTextField.html().replace( `${baseName}:${branchNameOld}`, - `${baseName}:${branchNameNew}` + `${baseName}:${branchNameNew}`, )); $selectionTextField.data('branch', branchNameNew); // update branch name in setting }; @@ -695,7 +695,7 @@ export function initIssueTemplateCommentEditors($commentForm) { const editor = await initComboMarkdownEditor($markdownEditor, { onContentChanged: (editor) => { $formField.val(editor.value()); - } + }, }); $formField.on('focus', async () => { diff --git a/web_src/js/features/repo-settings.js b/web_src/js/features/repo-settings.js index 0418f3a14a..58b714fbb7 100644 --- a/web_src/js/features/repo-settings.js +++ b/web_src/js/features/repo-settings.js @@ -39,7 +39,7 @@ export function initRepoSettingsCollaboration() { $text.text('(none)'); // prevent from misleading users when the access mode is undefined } }, 0); - } + }, }); }); } @@ -56,15 +56,15 @@ export function initRepoSettingSearchTeamBox() { $.each(response.data, (_i, item) => { items.push({ title: item.name, - description: `${item.permission} access` // TODO: translate this string + description: `${item.permission} access`, // TODO: translate this string }); }); return {results: items}; - } + }, }, searchFields: ['name', 'description'], - showNoResults: false + showNoResults: false, }); } diff --git a/web_src/js/features/repo-template.js b/web_src/js/features/repo-template.js index 1e83e74780..5f63e8b3ba 100644 --- a/web_src/js/features/repo-template.js +++ b/web_src/js/features/repo-template.js @@ -29,13 +29,13 @@ export function initRepoTemplateSearch() { const filteredResponse = {success: true, results: []}; filteredResponse.results.push({ name: '', - value: '' + value: '', }); // Parse the response from the api to work with our dropdown $.each(response.data, (_r, repo) => { filteredResponse.results.push({ name: htmlEscape(repo.repository.full_name), - value: repo.repository.id + value: repo.repository.id, }); }); return filteredResponse; @@ -43,7 +43,7 @@ export function initRepoTemplateSearch() { cache: false, }, - fullTextSearch: true + fullTextSearch: true, }); }; $('#uid').on('change', changeOwner); diff --git a/web_src/js/features/repo-wiki.js b/web_src/js/features/repo-wiki.js index d51bf35c81..03a2c68c5a 100644 --- a/web_src/js/features/repo-wiki.js +++ b/web_src/js/features/repo-wiki.js @@ -60,7 +60,7 @@ async function initRepoWikiFormEditor() { 'gitea-code-inline', 'code', 'quote', '|', 'gitea-checkbox-empty', 'gitea-checkbox-checked', '|', 'unordered-list', 'ordered-list', '|', 'link', 'image', 'table', 'horizontal-rule', '|', - 'preview', 'fullscreen', 'side-by-side', '|', 'gitea-switch-to-textarea' + 'preview', 'fullscreen', 'side-by-side', '|', 'gitea-switch-to-textarea', ], }, }); diff --git a/web_src/js/features/tribute.js b/web_src/js/features/tribute.js index 055777be79..70a5de6913 100644 --- a/web_src/js/features/tribute.js +++ b/web_src/js/features/tribute.js @@ -25,7 +25,7 @@ function makeCollections({mentions, emoji}) { }, menuItemTemplate: (item) => { return `<div class="tribute-item">${emojiHTML(item.original)}<span>${htmlEscape(item.original)}</span></div>`; - } + }, }); } @@ -41,7 +41,7 @@ function makeCollections({mentions, emoji}) { ${item.original.fullname && item.original.fullname !== '' ? `<span class="fullname">${htmlEscape(item.original.fullname)}</span>` : ''} </div> `; - } + }, }); } diff --git a/web_src/js/features/user-auth-webauthn.js b/web_src/js/features/user-auth-webauthn.js index 363e039760..6dfbb4d765 100644 --- a/web_src/js/features/user-auth-webauthn.js +++ b/web_src/js/features/user-auth-webauthn.js @@ -26,7 +26,7 @@ export async function initUserAuthWebAuthn() { } try { const credential = await navigator.credentials.get({ - publicKey: options.publicKey + publicKey: options.publicKey, }); await verifyAssertion(credential); } catch (err) { @@ -37,7 +37,7 @@ export async function initUserAuthWebAuthn() { delete options.publicKey.extensions.appid; try { const credential = await navigator.credentials.get({ - publicKey: options.publicKey + publicKey: options.publicKey, }); await verifyAssertion(credential); } catch (err) { @@ -185,7 +185,7 @@ async function webAuthnRegisterRequest() { try { const credential = await navigator.credentials.create({ - publicKey: options.publicKey + publicKey: options.publicKey, }); await webauthnRegistered(credential); } catch (err) { |