Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JS refactors #22227

Merged
merged 1 commit into from
Dec 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion web_src/js/components/ActivityHeatmap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import {CalendarHeatmap} from 'vue3-calendar-heatmap';

export default {
name: 'ActivityHeatmap',
components: {CalendarHeatmap},
props: {
values: {
Expand Down
10 changes: 1 addition & 9 deletions web_src/js/components/ContextPopup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,13 @@ const luminance = (colorString) => {
const luminanceThreshold = 0.179;

export default {
name: 'ContextPopup',

components: {
SvgIcon,
},

components: {SvgIcon},
data: () => ({
loading: false,
issue: null,
i18nErrorOccurred: i18n.error_occurred,
i18nErrorMessage: null,
}),

computed: {
createdAt() {
return new Date(this.issue.created_at).toLocaleDateString(undefined, {year: 'numeric', month: 'short', day: 'numeric'});
Expand Down Expand Up @@ -107,7 +101,6 @@ export default {
});
}
},

mounted() {
this.$refs.root.addEventListener('us-load-context-popup', (e) => {
const data = e.detail;
Expand All @@ -116,7 +109,6 @@ export default {
}
});
},

methods: {
load(data) {
this.loading = true;
Expand Down
6 changes: 0 additions & 6 deletions web_src/js/components/DiffFileList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ import {doLoadMoreFiles} from '../features/repo-diff.js';
const {pageData} = window.config;

export default {
name: 'DiffFileList',

data: () => {
return pageData.diffFileInfo;
},

watch: {
fileListIsVisible(newValue) {
if (newValue === true) {
Expand All @@ -44,15 +41,12 @@ export default {
}
}
},

mounted() {
document.getElementById('show-file-list-btn').addEventListener('click', this.toggleFileList);
},

unmounted() {
document.getElementById('show-file-list-btn').removeEventListener('click', this.toggleFileList);
},

methods: {
toggleFileList() {
this.fileListIsVisible = !this.fileListIsVisible;
Expand Down
6 changes: 1 addition & 5 deletions web_src/js/components/DiffFileTree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,12 @@ const {pageData} = window.config;
const LOCAL_STORAGE_KEY = 'diff_file_tree_visible';

export default {
name: 'DiffFileTree',
components: {DiffFileTreeItem},

data: () => {
const fileTreeIsVisible = localStorage.getItem(LOCAL_STORAGE_KEY) === 'true';
pageData.diffFileInfo.fileTreeIsVisible = fileTreeIsVisible;
return pageData.diffFileInfo;
},

computed: {
fileTree() {
const result = [];
Expand Down Expand Up @@ -94,7 +91,6 @@ export default {
return result;
}
},

mounted() {
// ensure correct buttons when we are mounted to the dom
this.adjustToggleButton(this.fileTreeIsVisible);
Expand Down Expand Up @@ -125,7 +121,7 @@ export default {
doLoadMoreFiles(this.link, this.diffEnd, () => {
this.isLoadingNewData = false;
});
}
},
},
};
</script>
7 changes: 1 addition & 6 deletions web_src/js/components/DiffFileTreeItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@
import {SvgIcon} from '../svg.js';

export default {
name: 'DiffFileTreeItem',
components: {
SvgIcon,
},

components: {SvgIcon},
props: {
item: {
type: Object,
Expand All @@ -59,7 +55,6 @@ export default {
default: true
}
},

data: () => ({
collapsed: false,
}),
Expand Down
12 changes: 1 addition & 11 deletions web_src/js/components/PullRequestMergeForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,7 @@ import {SvgIcon} from '../svg.js';
const {csrfToken, pageData} = window.config;

export default {
name: 'PullRequestMergeForm',
components: {
SvgIcon,
},

components: {SvgIcon},
data: () => ({
csrfToken,
mergeForm: pageData.pullRequestMergeForm,
Expand All @@ -137,36 +133,30 @@ export default {
showMergeStyleMenu: false,
showActionForm: false,
}),

computed: {
mergeButtonStyleClass() {
if (this.mergeForm.allOverridableChecksOk) return 'green';
return this.autoMergeWhenSucceed ? 'blue' : 'red';
}
},

watch: {
mergeStyle(val) {
this.mergeStyleDetail = this.mergeForm.mergeStyles.find((e) => e.name === val);
}
},

created() {
this.mergeStyleAllowedCount = this.mergeForm.mergeStyles.reduce((v, msd) => v + (msd.allowed ? 1 : 0), 0);

let mergeStyle = this.mergeForm.mergeStyles.find((e) => e.allowed && e.name === this.mergeForm.defaultMergeStyle)?.name;
if (!mergeStyle) mergeStyle = this.mergeForm.mergeStyles.find((e) => e.allowed)?.name;
this.switchMergeStyle(mergeStyle, !this.mergeForm.canMergeNow);
},

mounted() {
document.addEventListener('mouseup', this.hideMergeStyleMenu);
},

unmounted() {
document.removeEventListener('mouseup', this.hideMergeStyleMenu);
},

methods: {
hideMergeStyleMenu() {
this.showMergeStyleMenu = false;
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/clipboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function fallbackCopyToClipboard(text) {

// For all DOM elements with [data-clipboard-target] or [data-clipboard-text],
// this copy-to-clipboard will work for them
export default function initGlobalCopyToClipboardListener() {
export function initGlobalCopyToClipboardListener() {
document.addEventListener('click', (e) => {
let target = e.target;
// in case <button data-clipboard-text><svg></button>, so we just search
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/colorpicker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default async function createColorPicker($els) {
export async function createColorPicker($els) {
if (!$els || !$els.length) return;

await Promise.all([
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/common-global.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import $ from 'jquery';
import 'jquery.are-you-sure';
import {mqBinarySearch} from '../utils.js';
import createDropzone from './dropzone.js';
import {createDropzone} from './dropzone.js';
import {initCompColorPicker} from './comp/ColorPicker.js';
import {showGlobalErrorMessage} from '../bootstrap.js';
import {attachDropdownAria} from './aria.js';
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/comp/ColorPicker.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import $ from 'jquery';
import createColorPicker from '../colorpicker.js';
import {createColorPicker} from '../colorpicker.js';

export function initCompColorPicker() {
createColorPicker($('.color-picker'));
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/comp/EasyMDE.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import $ from 'jquery';
import attachTribute from '../tribute.js';
import {attachTribute} from '../tribute.js';
import {handleGlobalEnterQuickSubmit} from './QuickSubmit.js';

/**
Expand Down
1 change: 0 additions & 1 deletion web_src/js/features/comp/SearchUserBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import $ from 'jquery';
import {htmlEscape} from 'escape-goat';

const {appSubUrl} = window.config;

const looksLikeEmailAddressCheck = /^\S+@\S+$/;

export function initCompSearchUserBox() {
Expand Down
1 change: 1 addition & 0 deletions web_src/js/features/comp/WebHookEditor.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import $ from 'jquery';

const {csrfToken} = window.config;

export function initCompWebHookEditor() {
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/contextpopup.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ContextPopup from '../components/ContextPopup.vue';
import {parseIssueHref} from '../utils.js';
import {createTippy} from '../modules/tippy.js';

export default function initContextPopups() {
export function initContextPopups() {
const refIssues = $('.ref-issue');
if (!refIssues.length) return;

Expand Down
1 change: 1 addition & 0 deletions web_src/js/features/copycontent.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {copyToClipboard} from './clipboard.js';
import {showTemporaryTooltip} from '../modules/tippy.js';
import {convertImage} from '../utils.js';

const {i18n} = window.config;

async function doCopy(content, btn) {
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/dropzone.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default async function createDropzone(el, opts) {
export async function createDropzone(el, opts) {
const [{Dropzone}] = await Promise.all([
import(/* webpackChunkName: "dropzone" */'dropzone'),
import(/* webpackChunkName: "dropzone" */'dropzone/dist/dropzone.css'),
Expand Down
3 changes: 1 addition & 2 deletions web_src/js/features/emoji.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import emojis from '../../../assets/emoji.json';

const {assetUrlPrefix} = window.config;
const {customEmojis} = window.config;
const {assetUrlPrefix, customEmojis} = window.config;

const tempMap = {...customEmojis};
for (const {emoji, aliases} of emojis) {
Expand Down
1 change: 0 additions & 1 deletion web_src/js/features/file-fold.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {svg} from '../svg.js';


// Hides the file if newFold is true, and shows it otherwise. The actual hiding is performed using CSS.
//
// The fold arrow is the icon displayed on the upper left of the file box, especially intended for components having the 'fold-file' class.
Expand Down
1 change: 0 additions & 1 deletion web_src/js/features/formatting.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {prettyNumber} from '../utils.js';

const {lang} = document.documentElement;

const dateFormatter = new Intl.DateTimeFormat(lang, {year: 'numeric', month: 'long', day: 'numeric'});
const shortDateFormatter = new Intl.DateTimeFormat(lang, {year: 'numeric', month: 'short', day: 'numeric'});
const dateTimeFormatter = new Intl.DateTimeFormat(lang, {year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric'});
Expand Down
3 changes: 2 additions & 1 deletion web_src/js/features/heatmap.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {createApp} from 'vue';
import ActivityHeatmap from '../components/ActivityHeatmap.vue';
import {translateMonth, translateDay} from '../utils.js';
export default function initHeatmap() {

export function initHeatmap() {
const el = document.getElementById('user-heatmap');
if (!el) return;

Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/imagediff.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function getDefaultSvgBoundsIfUndefined(svgXml, src) {
return null;
}

export default function initImageDiff() {
export function initImageDiff() {
function createContext(image1, image2) {
const size1 = {
width: image1 && image1.width || 0,
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/repo-diff-filetree.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {createApp} from 'vue';
import DiffFileTree from '../components/DiffFileTree.vue';
import DiffFileList from '../components/DiffFileList.vue';

export default function initDiffFileTree() {
export function initDiffFileTree() {
const el = document.getElementById('diff-file-tree');
if (!el) return;

Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/repo-findfile.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import $ from 'jquery';

import {svg} from '../svg.js';

const {csrf} = window.config;

const threshold = 50;
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/repo-graph.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import $ from 'jquery';

export default function initRepoGraphGit() {
export function initRepoGraphGit() {
const graphContainer = document.getElementById('git-graph-container');
if (!graphContainer) return;

Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/repo-issue-pr-form.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {createApp} from 'vue';
import PullRequestMergeForm from '../components/PullRequestMergeForm.vue';

export default function initPullRequestMergeForm() {
export function initRepoPullRequestMergeForm() {
const el = document.getElementById('pull-request-merge-form');
if (!el) return;

Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/repo-issue.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import $ from 'jquery';
import {htmlEscape} from 'escape-goat';
import attachTribute from './tribute.js';
import {attachTribute} from './tribute.js';
import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js';
import {initEasyMDEImagePaste} from './comp/ImagePaste.js';
import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
Expand Down
21 changes: 8 additions & 13 deletions web_src/js/features/repo-legacy.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,28 @@ import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js';
import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
import {initEasyMDEImagePaste} from './comp/ImagePaste.js';
import {
initRepoIssueBranchSelect, initRepoIssueCodeCommentCancel,
initRepoIssueCommentDelete,
initRepoIssueComments, initRepoIssueDependencyDelete,
initRepoIssueReferenceIssue, initRepoIssueStatusButton,
initRepoIssueTitleEdit,
initRepoIssueWipToggle, initRepoPullRequestUpdate,
updateIssuesMeta,
initRepoIssueBranchSelect, initRepoIssueCodeCommentCancel, initRepoIssueCommentDelete,
initRepoIssueComments, initRepoIssueDependencyDelete, initRepoIssueReferenceIssue,
initRepoIssueStatusButton, initRepoIssueTitleEdit, initRepoIssueWipToggle,
initRepoPullRequestUpdate, updateIssuesMeta,
} from './repo-issue.js';
import {initUnicodeEscapeButton} from './repo-unicode-escape.js';
import {svg} from '../svg.js';
import {htmlEscape} from 'escape-goat';
import {initRepoBranchTagDropdown} from '../components/RepoBranchTagDropdown.js';
import {
initRepoCloneLink,
initRepoCommonBranchOrTagDropdown,
initRepoCommonFilterSearchDropdown,
initRepoCloneLink, initRepoCommonBranchOrTagDropdown, initRepoCommonFilterSearchDropdown,
initRepoCommonLanguageStats,
} from './repo-common.js';
import {initCitationFileCopyContent} from './citation.js';
import {initCompLabelEdit} from './comp/LabelEdit.js';
import {initRepoDiffConversationNav} from './repo-diff.js';
import attachTribute from './tribute.js';
import createDropzone from './dropzone.js';
import {attachTribute} from './tribute.js';
import {createDropzone} from './dropzone.js';
import {initCommentContent, initMarkupContent} from '../markup/content.js';
import {initCompReactionSelector} from './comp/ReactionSelector.js';
import {initRepoSettingBranches} from './repo-settings.js';
import initRepoPullRequestMergeForm from './repo-issue-pr-form.js';
import {initRepoPullRequestMergeForm} from './repo-issue-pr-form.js';

const {csrfToken} = window.config;

Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/repo-migration.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const $lfsSettings = $('#lfs_settings');
const $lfsEndpoint = $('#lfs_endpoint');
const $items = $('#migrate_items').find('input[type=checkbox]');

export default function initRepoMigration() {
export function initRepoMigration() {
checkAuth();
setLFSSettingsVisibility();

Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/repo-projects.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ async function initRepoProjectSortable() {
}
}

export default function initRepoProject() {
export function initRepoProject() {
if (!$('.repository.projects').length) {
return;
}
Expand Down
Loading