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

Misc JS linting and naming tweaks (#10652)

Browse source 
- lowercase all js filenames except Vue components
- enable new lint rules, mostly focused on shorter code
- autofix new lint violations
- apply misc transformations indexOf -> includes and onevent-> addEventListener

Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
This commit is contained in:
silverwind 2020-03-11 20:34:54 +01:00 committed by GitHub
parent 984b85c1a7
commit e03d627769
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 89 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.eslintrc
View file

@ -26,19 +26,22 @@ globals:
rules: rules:
arrow-body-style: [0] arrow-body-style: [0]
arrow-parens: [2, always]
camelcase: [0] camelcase: [0]
comma-dangle: [2, only-multiline] comma-dangle: [2, only-multiline]
consistent-return: [0] consistent-return: [0]
default-case: [0] default-case: [0]
func-names: [0] func-names: [0]
import/extensions: [0] import/extensions: [2, always, {ignorePackages: true}]
import/prefer-default-export: [0] import/prefer-default-export: [0]
max-len: [0] max-len: [0]
multiline-comment-style: [2, separate-lines]
newline-per-chained-call: [0] newline-per-chained-call: [0]
no-alert: [0] no-alert: [0]
no-cond-assign: [2, except-parens] no-cond-assign: [2, except-parens]
no-console: [1, {allow: [info, warn, error]}] no-console: [1, {allow: [info, warn, error]}]
no-continue: [0] no-continue: [0]
no-eq-null: [2]
no-mixed-operators: [0] no-mixed-operators: [0]
no-multi-assign: [0] no-multi-assign: [0]
no-new: [0] no-new: [0]
@ -49,8 +52,12 @@ rules:
no-unused-vars: [2, {args: all, argsIgnorePattern: ^_, varsIgnorePattern: ^_, ignoreRestSiblings: true}] no-unused-vars: [2, {args: all, argsIgnorePattern: ^_, varsIgnorePattern: ^_, ignoreRestSiblings: true}]
no-use-before-define: [0] no-use-before-define: [0]
no-var: [2] no-var: [2]
object-curly-spacing: [2, never]
one-var-declaration-per-line: [0] one-var-declaration-per-line: [0]
one-var: [0] one-var: [0]
operator-linebreak: [2, after]
prefer-const: [2, {destructuring: all}] prefer-const: [2, {destructuring: all}]
prefer-destructuring: [0] prefer-destructuring: [0]
quotes: [2, single, {avoidEscape: true, allowTemplateLiterals: true}]
radix: [2, as-needed] radix: [2, as-needed]
semi: [2, always, {omitLastInOneLineBlock: true}]

0
web_src/js/features/contextPopup.js → web_src/js/features/contextpopup.js
View file

2
web_src/js/features/gitGraph.js → web_src/js/features/gitgraph.js
View file

@ -2,7 +2,7 @@ export default async function initGitGraph() {
const graphCanvas = document.getElementById('graph-canvas'); const graphCanvas = document.getElementById('graph-canvas');
if (!graphCanvas) return; if (!graphCanvas) return;
const { default: gitGraph } = await import(/* webpackChunkName: "gitgraph" */'../vendor/gitGraph.js'); const {default: gitGraph} = await import(/* webpackChunkName: "gitgraph" */'../vendor/gitgraph.js');
const graphList = []; const graphList = [];
$('#graph-raw-list li span.node-relation').each(function () { $('#graph-raw-list li span.node-relation').each(function () {

0
web_src/js/features/userHeatmap.js → web_src/js/features/userheatmap.js
View file

84
web_src/js/index.js
View file

@ -2,21 +2,20 @@
/* exported timeAddManual, toggleStopwatch, cancelStopwatch */ /* exported timeAddManual, toggleStopwatch, cancelStopwatch */
/* exported toggleDeadlineForm, setDeadline, updateDeadline, deleteDependencyModal, cancelCodeComment, onOAuthLoginClick */ /* exported toggleDeadlineForm, setDeadline, updateDeadline, deleteDependencyModal, cancelCodeComment, onOAuthLoginClick */
import './publicPath.js'; import './publicpath.js';
import './polyfills.js'; import './polyfills.js';
import Vue from 'vue'; import Vue from 'vue';
import 'jquery.are-you-sure'; import 'jquery.are-you-sure';
import './vendor/semanticDropdown.js'; import './vendor/semanticdropdown.js';
import {svg} from './utils.js'; import {svg} from './utils.js';
import initContextPopups from './features/contextPopup.js'; import initContextPopups from './features/contextpopup.js';
import initHighlight from './features/highlight.js'; import initHighlight from './features/highlight.js';
import initGitGraph from './features/gitGraph.js'; import initGitGraph from './features/gitgraph.js';
import initClipboard from './features/clipboard.js'; import initClipboard from './features/clipboard.js';
import initUserHeatmap from './features/userHeatmap.js'; import initUserHeatmap from './features/userheatmap.js';
import createDropzone from './features/dropzone.js'; import createDropzone from './features/dropzone.js';
import ActivityTopAuthors from './components/ActivityTopAuthors.vue'; import ActivityTopAuthors from './components/ActivityTopAuthors.vue';
const {AppSubUrl, StaticUrlPrefix, csrf} = window.config; const {AppSubUrl, StaticUrlPrefix, csrf} = window.config;
@ -99,7 +98,6 @@ function initEditDiffTab($form) {
}); });
} }
function initEditForm() { function initEditForm() {
if ($('.edit.form').length === 0) { if ($('.edit.form').length === 0) {
return; return;
@ -192,9 +190,7 @@ function initReactionSelector(parent) {
if ($(this).hasClass('disabled')) return; if ($(this).hasClass('disabled')) return;
const actionURL = $(this).hasClass('item') const actionURL = $(this).hasClass('item') ? $(this).closest('.select-reaction').data('action-url') : $(this).data('action-url');
? $(this).closest('.select-reaction').data('action-url')
: $(this).data('action-url');
const url = `${actionURL}/${$(this).hasClass('blue') ? 'unreact' : 'react'}`; const url = `${actionURL}/${$(this).hasClass('blue') ? 'unreact' : 'react'}`;
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
@ -235,9 +231,7 @@ function insertAtCursor(field, value) {
if (field.selectionStart || field.selectionStart === 0) { if (field.selectionStart || field.selectionStart === 0) {
const startPos = field.selectionStart; const startPos = field.selectionStart;
const endPos = field.selectionEnd; const endPos = field.selectionEnd;
field.value = field.value.substring(0, startPos) field.value = field.value.substring(0, startPos) + value + field.value.substring(endPos, field.value.length);
+ value
+ field.value.substring(endPos, field.value.length);
field.selectionStart = startPos + value.length; field.selectionStart = startPos + value.length;
field.selectionEnd = startPos + value.length; field.selectionEnd = startPos + value.length;
} else { } else {
@ -268,7 +262,7 @@ function retrieveImageFromClipboardAsBlob(pasteEvent, callback) {
} }
for (let i = 0; i < items.length; i++) { for (let i = 0; i < items.length; i++) {
if (items[i].type.indexOf('image') === -1) continue; if (!items[i].type.includes('image')) continue;
const blob = items[i].getAsFile(); const blob = items[i].getAsFile();
if (typeof (callback) === 'function') { if (typeof (callback) === 'function') {
@ -282,11 +276,11 @@ function retrieveImageFromClipboardAsBlob(pasteEvent, callback) {
function uploadFile(file, callback) { function uploadFile(file, callback) {
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.onload = function () { xhr.addEventListener('load', () => {
if (xhr.status === 200) { if (xhr.status === 200) {
callback(xhr.responseText); callback(xhr.responseText);
} }
}; });
xhr.open('post', `${AppSubUrl}/attachments`, true); xhr.open('post', `${AppSubUrl}/attachments`, true);
xhr.setRequestHeader('X-Csrf-Token', csrf); xhr.setRequestHeader('X-Csrf-Token', csrf);
@ -493,8 +487,8 @@ function initCommentForm() {
htmlEncode($(this).text())}</a>`); htmlEncode($(this).text())}</a>`);
break; break;
case '#assignee_id': case '#assignee_id':
$list.find('.selected').html(`<a class="item" href=${$(this).data('href')}>` $list.find('.selected').html(`<a class="item" href=${$(this).data('href')}>` +
+ `<img class="ui avatar image" src=${$(this).data('avatar')}>${ `<img class="ui avatar image" src=${$(this).data('avatar')}>${
htmlEncode($(this).text())}</a>`); htmlEncode($(this).text())}</a>`);
} }
$(`.ui${select_id}.list .no-select`).addClass('hide'); $(`.ui${select_id}.list .no-select`).addClass('hide');
@ -797,11 +791,9 @@ function initRepository() {
$.post(update_url, { $.post(update_url, {
_csrf: csrf, _csrf: csrf,
target_branch: targetBranch target_branch: targetBranch
}) }).success((data) => {
.success((data) => {
$branchTarget.text(data.base_branch); $branchTarget.text(data.base_branch);
}) }).always(() => {
.always(() => {
reload(); reload();
}); });
}; };
@ -814,8 +806,7 @@ function initRepository() {
$.post($(this).data('update-url'), { $.post($(this).data('update-url'), {
_csrf: csrf, _csrf: csrf,
title: $editInput.val() title: $editInput.val()
}, }, (data) => {
(data) => {
$editInput.val(data.title); $editInput.val(data.title);
$issueTitle.text(data.title); $issueTitle.text(data.title);
pullrequest_targetbranch_change(pullrequest_target_update_url); pullrequest_targetbranch_change(pullrequest_target_update_url);
@ -1142,8 +1133,8 @@ function initMigration() {
const toggleMigrations = function () { const toggleMigrations = function () {
const authUserName = $('#auth_username').val(); const authUserName = $('#auth_username').val();
const cloneAddr = $('#clone_addr').val(); const cloneAddr = $('#clone_addr').val();
if (!$('#mirror').is(':checked') && (authUserName && authUserName.length > 0) if (!$('#mirror').is(':checked') && (authUserName && authUserName.length > 0) &&
&& (cloneAddr !== undefined && (cloneAddr.startsWith('https://github.com') || cloneAddr.startsWith('http://github.com')))) { (cloneAddr !== undefined && (cloneAddr.startsWith('https://github.com') || cloneAddr.startsWith('http://github.com')))) {
$('#migrate_items').show(); $('#migrate_items').show();
} else { } else {
$('#migrate_items').hide(); $('#migrate_items').hide();
@ -1203,8 +1194,7 @@ function initPullRequestReview() {
.on('mouseenter', function () { .on('mouseenter', function () {
const parent = $(this).closest('td'); const parent = $(this).closest('td');
$(this).closest('tr').addClass( $(this).closest('tr').addClass(
parent.hasClass('lines-num-old') || parent.hasClass('lines-code-old') parent.hasClass('lines-num-old') || parent.hasClass('lines-code-old') ? 'focus-lines-old' : 'focus-lines-new'
? 'focus-lines-old' : 'focus-lines-new'
); );
}) })
.on('mouseleave', function () { .on('mouseleave', function () {
@ -1225,8 +1215,8 @@ function initPullRequestReview() {
let ntr = tr.next(); let ntr = tr.next();
if (!ntr.hasClass('add-comment')) { if (!ntr.hasClass('add-comment')) {
ntr = $(`<tr class="add-comment">${ ntr = $(`<tr class="add-comment">${
isSplit ? '<td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-left"></td><td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-right"></td>' isSplit ? '<td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-left"></td><td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-right"></td>' :
: '<td class="lines-num"></td><td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-left add-comment-right"></td>' '<td class="lines-num"></td><td class="lines-num"></td><td class="lines-type-marker"></td><td class="add-comment-left add-comment-right"></td>'
}</tr>`); }</tr>`);
tr.after(ntr); tr.after(ntr);
} }
@ -1297,7 +1287,7 @@ function initWikiForm() {
// FIXME: still send render request when return back to edit mode // FIXME: still send render request when return back to edit mode
const render = function () { const render = function () {
sideBySideChanges = 0; sideBySideChanges = 0;
if (sideBySideTimeout != null) { if (sideBySideTimeout !== null) {
clearTimeout(sideBySideTimeout); clearTimeout(sideBySideTimeout);
sideBySideTimeout = null; sideBySideTimeout = null;
} }
@ -1306,8 +1296,7 @@ function initWikiForm() {
mode: 'gfm', mode: 'gfm',
context: $editArea.data('context'), context: $editArea.data('context'),
text: plainText text: plainText
}, }, (data) => {
(data) => {
preview.innerHTML = `<div class="markdown ui segment">${data}</div>`; preview.innerHTML = `<div class="markdown ui segment">${data}</div>`;
emojify.run($('.editor-preview')[0]); emojify.run($('.editor-preview')[0]);
$(preview).find('pre code').each((_, e) => { $(preview).find('pre code').each((_, e) => {
@ -1324,7 +1313,7 @@ function initWikiForm() {
render(); render();
} }
// or delay preview by timeout // or delay preview by timeout
if (sideBySideTimeout != null) { if (sideBySideTimeout !== null) {
clearTimeout(sideBySideTimeout); clearTimeout(sideBySideTimeout);
sideBySideTimeout = null; sideBySideTimeout = null;
} }
@ -1479,8 +1468,7 @@ function setSimpleMDE($editArea) {
mode: 'gfm', mode: 'gfm',
context: $editArea.data('context'), context: $editArea.data('context'),
text: plainText text: plainText
}, }, (data) => {
(data) => {
preview.innerHTML = `<div class="markdown ui segment">${data}</div>`; preview.innerHTML = `<div class="markdown ui segment">${data}</div>`;
emojify.run($('.editor-preview')[0]); emojify.run($('.editor-preview')[0]);
}); });
@ -1658,7 +1646,7 @@ function initEditor() {
apiCall = extension; apiCall = extension;
} }
if (previewLink.length && apiCall && previewFileModes && previewFileModes.length && previewFileModes.indexOf(apiCall) >= 0) { if (previewLink.length && apiCall && previewFileModes && previewFileModes.length && previewFileModes.includes(apiCall)) {
dataUrl = previewLink.data('url'); dataUrl = previewLink.data('url');
previewLink.data('url', dataUrl.replace(/(.*)\/.*/i, `$1/${mode}`)); previewLink.data('url', dataUrl.replace(/(.*)\/.*/i, `$1/${mode}`));
previewLink.show(); previewLink.show();
@ -1667,7 +1655,7 @@ function initEditor() {
} }
// If this file is a Markdown extensions, we will load that editor and return // If this file is a Markdown extensions, we will load that editor and return
if (markdownFileExts.indexOf(extWithDot) >= 0) { if (markdownFileExts.includes(extWithDot)) {
if (setSimpleMDE($editArea)) { if (setSimpleMDE($editArea)) {
return; return;
} }
@ -1683,7 +1671,7 @@ function initEditor() {
CodeMirror.autoLoadMode(codeMirrorEditor, mode); CodeMirror.autoLoadMode(codeMirrorEditor, mode);
} }
if (lineWrapExtensions.indexOf(extWithDot) >= 0) { if (lineWrapExtensions.includes(extWithDot)) {
codeMirrorEditor.setOption('lineWrapping', true); codeMirrorEditor.setOption('lineWrapping', true);
} else { } else {
codeMirrorEditor.setOption('lineWrapping', false); codeMirrorEditor.setOption('lineWrapping', false);
@ -1708,7 +1696,7 @@ function initEditor() {
// - https://codemirror.net/doc/manual.html#keymaps // - https://codemirror.net/doc/manual.html#keymaps
codeMirrorEditor.setOption('extraKeys', { codeMirrorEditor.setOption('extraKeys', {
Tab(cm) { Tab(cm) {
const spaces = Array(parseInt(cm.getOption('indentUnit')) + 1).join(' '); const spaces = new Array(parseInt(cm.getOption('indentUnit')) + 1).join(' ');
cm.replaceSelection(spaces); cm.replaceSelection(spaces);
} }
}); });
@ -2165,11 +2153,11 @@ function initCodeView() {
const $row = $blob.parent().parent(); const $row = $blob.parent().parent();
$.get(`${$blob.data('url')}?${$blob.data('query')}&anchor=${$blob.data('anchor')}`, (blob) => { $.get(`${$blob.data('url')}?${$blob.data('query')}&anchor=${$blob.data('anchor')}`, (blob) => {
$row.replaceWith(blob); $row.replaceWith(blob);
$(`[data-anchor="${$blob.data('anchor')}"]`).on('click', (e) => { insertBlobExcerpt(e); }); $(`[data-anchor="${$blob.data('anchor')}"]`).on('click', (e) => { insertBlobExcerpt(e) });
$('.diff-detail-box.ui.sticky').sticky(); $('.diff-detail-box.ui.sticky').sticky();
}); });
} }
$('.ui.blob-excerpt').on('click', (e) => { insertBlobExcerpt(e); }); $('.ui.blob-excerpt').on('click', (e) => { insertBlobExcerpt(e) });
} }
function initU2FAuth() { function initU2FAuth() {
@ -2238,7 +2226,6 @@ function checkError(resp) {
return true; return true;
} }
function u2fError(errorType) { function u2fError(errorType) {
const u2fErrors = { const u2fErrors = {
browser: $('#unsupported-browser'), browser: $('#unsupported-browser'),
@ -2529,7 +2516,7 @@ $(document).ready(async () => {
// NOTICE: This reset of checkbox state targets Firefox caching behaviour, as the checkboxes stay checked after reload // NOTICE: This reset of checkbox state targets Firefox caching behaviour, as the checkboxes stay checked after reload
if (action === 'close' || action === 'open') { if (action === 'close' || action === 'open') {
// uncheck all checkboxes // uncheck all checkboxes
$('.issue-checkbox input[type="checkbox"]').each((_, e) => { e.checked = false; }); $('.issue-checkbox input[type="checkbox"]').each((_, e) => { e.checked = false });
} }
reload(); reload();
}); });
@ -3031,8 +3018,8 @@ function initFilterBranchTagDropdown(selector) {
const vm = this; const vm = this;
const items = vm.items.filter((item) => { const items = vm.items.filter((item) => {
return ((vm.mode === 'branches' && item.branch) || (vm.mode === 'tags' && item.tag)) return ((vm.mode === 'branches' && item.branch) || (vm.mode === 'tags' && item.tag)) &&
&& (!vm.searchTerm || item.name.toLowerCase().indexOf(vm.searchTerm.toLowerCase()) >= 0); (!vm.searchTerm || item.name.toLowerCase().includes(vm.searchTerm.toLowerCase()));
}); });
vm.active = (items.length === 0 && vm.showCreateNewBranch ? 0 : -1); vm.active = (items.length === 0 && vm.showCreateNewBranch ? 0 : -1);
@ -3276,13 +3263,13 @@ function initTopicbar() {
const query = stripTags(this.urlData.query.trim()); const query = stripTags(this.urlData.query.trim());
let found_query = false; let found_query = false;
const current_topics = []; const current_topics = [];
topicDropdown.find('div.label.visible.topic,a.label.visible').each((_, e) => { current_topics.push(e.dataset.value); }); topicDropdown.find('div.label.visible.topic,a.label.visible').each((_, e) => { current_topics.push(e.dataset.value) });
if (res.topics) { if (res.topics) {
let found = false; let found = false;
for (let i = 0; i < res.topics.length; i++) { for (let i = 0; i < res.topics.length; i++) {
// skip currently added tags // skip currently added tags
if (current_topics.indexOf(res.topics[i].topic_name) !== -1) { if (current_topics.includes(res.topics[i].topic_name)) {
continue; continue;
} }
@ -3308,7 +3295,6 @@ function initTopicbar() {
}); });
} }
return formattedResponse; return formattedResponse;
}, },
}, },

4
web_src/js/publicPath.js → web_src/js/publicpath.js
View file

@ -1,5 +1,5 @@
/* This sets up webpack's chunk loading to load resources from the 'public' // This sets up webpack's chunk loading to load resources from the 'public'
directory. This file must be imported before any lazy-loading is being attempted. */ // directory. This file must be imported before any lazy-loading is being attempted.
if (document.currentScript && document.currentScript.src) { if (document.currentScript && document.currentScript.src) {
const url = new URL(document.currentScript.src); const url = new URL(document.currentScript.src);

0
web_src/js/vendor/gitGraph.js → web_src/js/vendor/gitgraph.js vendored
View file

0
web_src/js/vendor/semanticDropdown.js → web_src/js/vendor/semanticdropdown.js vendored
View file