Skip to content

Commit fc910cc

Browse files
committed
JS refactors
- Replace all default exports with named exports, except for Vue SFCs - Remove names from Vue SFCs, they are automatically inferred from the filename - Misc whitespace-related tweaks
1 parent 71ca306 commit fc910cc

35 files changed

+47
-89
lines changed

web_src/js/components/ActivityHeatmap.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import {CalendarHeatmap} from 'vue3-calendar-heatmap';
1919
2020
export default {
21-
name: 'ActivityHeatmap',
2221
components: {CalendarHeatmap},
2322
props: {
2423
values: {

web_src/js/components/ContextPopup.vue

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,13 @@ const luminance = (colorString) => {
4646
const luminanceThreshold = 0.179;
4747
4848
export default {
49-
name: 'ContextPopup',
50-
51-
components: {
52-
SvgIcon,
53-
},
54-
49+
components: {SvgIcon},
5550
data: () => ({
5651
loading: false,
5752
issue: null,
5853
i18nErrorOccurred: i18n.error_occurred,
5954
i18nErrorMessage: null,
6055
}),
61-
6256
computed: {
6357
createdAt() {
6458
return new Date(this.issue.created_at).toLocaleDateString(undefined, {year: 'numeric', month: 'short', day: 'numeric'});
@@ -107,7 +101,6 @@ export default {
107101
});
108102
}
109103
},
110-
111104
mounted() {
112105
this.$refs.root.addEventListener('us-load-context-popup', (e) => {
113106
const data = e.detail;
@@ -116,7 +109,6 @@ export default {
116109
}
117110
});
118111
},
119-
120112
methods: {
121113
load(data) {
122114
this.loading = true;

web_src/js/components/DiffFileList.vue

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ import {doLoadMoreFiles} from '../features/repo-diff.js';
2727
const {pageData} = window.config;
2828
2929
export default {
30-
name: 'DiffFileList',
31-
3230
data: () => {
3331
return pageData.diffFileInfo;
3432
},
35-
3633
watch: {
3734
fileListIsVisible(newValue) {
3835
if (newValue === true) {
@@ -44,15 +41,12 @@ export default {
4441
}
4542
}
4643
},
47-
4844
mounted() {
4945
document.getElementById('show-file-list-btn').addEventListener('click', this.toggleFileList);
5046
},
51-
5247
unmounted() {
5348
document.getElementById('show-file-list-btn').removeEventListener('click', this.toggleFileList);
5449
},
55-
5650
methods: {
5751
toggleFileList() {
5852
this.fileListIsVisible = !this.fileListIsVisible;

web_src/js/components/DiffFileTree.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ const {pageData} = window.config;
2121
const LOCAL_STORAGE_KEY = 'diff_file_tree_visible';
2222
2323
export default {
24-
name: 'DiffFileTree',
2524
components: {DiffFileTreeItem},
26-
2725
data: () => {
2826
const fileTreeIsVisible = localStorage.getItem(LOCAL_STORAGE_KEY) === 'true';
2927
pageData.diffFileInfo.fileTreeIsVisible = fileTreeIsVisible;
3028
return pageData.diffFileInfo;
3129
},
32-
3330
computed: {
3431
fileTree() {
3532
const result = [];
@@ -94,7 +91,6 @@ export default {
9491
return result;
9592
}
9693
},
97-
9894
mounted() {
9995
// ensure correct buttons when we are mounted to the dom
10096
this.adjustToggleButton(this.fileTreeIsVisible);
@@ -125,7 +121,7 @@ export default {
125121
doLoadMoreFiles(this.link, this.diffEnd, () => {
126122
this.isLoadingNewData = false;
127123
});
128-
}
124+
},
129125
},
130126
};
131127
</script>

web_src/js/components/DiffFileTreeItem.vue

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@
4343
import {SvgIcon} from '../svg.js';
4444
4545
export default {
46-
name: 'DiffFileTreeItem',
47-
components: {
48-
SvgIcon,
49-
},
50-
46+
components: {SvgIcon},
5147
props: {
5248
item: {
5349
type: Object,
@@ -59,7 +55,6 @@ export default {
5955
default: true
6056
}
6157
},
62-
6358
data: () => ({
6459
collapsed: false,
6560
}),

web_src/js/components/PullRequestMergeForm.vue

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,7 @@ import {SvgIcon} from '../svg.js';
111111
const {csrfToken, pageData} = window.config;
112112
113113
export default {
114-
name: 'PullRequestMergeForm',
115-
components: {
116-
SvgIcon,
117-
},
118-
114+
components: {SvgIcon},
119115
data: () => ({
120116
csrfToken,
121117
mergeForm: pageData.pullRequestMergeForm,
@@ -137,36 +133,30 @@ export default {
137133
showMergeStyleMenu: false,
138134
showActionForm: false,
139135
}),
140-
141136
computed: {
142137
mergeButtonStyleClass() {
143138
if (this.mergeForm.allOverridableChecksOk) return 'green';
144139
return this.autoMergeWhenSucceed ? 'blue' : 'red';
145140
}
146141
},
147-
148142
watch: {
149143
mergeStyle(val) {
150144
this.mergeStyleDetail = this.mergeForm.mergeStyles.find((e) => e.name === val);
151145
}
152146
},
153-
154147
created() {
155148
this.mergeStyleAllowedCount = this.mergeForm.mergeStyles.reduce((v, msd) => v + (msd.allowed ? 1 : 0), 0);
156149
157150
let mergeStyle = this.mergeForm.mergeStyles.find((e) => e.allowed && e.name === this.mergeForm.defaultMergeStyle)?.name;
158151
if (!mergeStyle) mergeStyle = this.mergeForm.mergeStyles.find((e) => e.allowed)?.name;
159152
this.switchMergeStyle(mergeStyle, !this.mergeForm.canMergeNow);
160153
},
161-
162154
mounted() {
163155
document.addEventListener('mouseup', this.hideMergeStyleMenu);
164156
},
165-
166157
unmounted() {
167158
document.removeEventListener('mouseup', this.hideMergeStyleMenu);
168159
},
169-
170160
methods: {
171161
hideMergeStyleMenu() {
172162
this.showMergeStyleMenu = false;

web_src/js/features/clipboard.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function fallbackCopyToClipboard(text) {
4444

4545
// For all DOM elements with [data-clipboard-target] or [data-clipboard-text],
4646
// this copy-to-clipboard will work for them
47-
export default function initGlobalCopyToClipboardListener() {
47+
export function initGlobalCopyToClipboardListener() {
4848
document.addEventListener('click', (e) => {
4949
let target = e.target;
5050
// in case <button data-clipboard-text><svg></button>, so we just search

web_src/js/features/colorpicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export default async function createColorPicker($els) {
1+
export async function createColorPicker($els) {
22
if (!$els || !$els.length) return;
33

44
await Promise.all([

web_src/js/features/common-global.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import $ from 'jquery';
22
import 'jquery.are-you-sure';
33
import {mqBinarySearch} from '../utils.js';
4-
import createDropzone from './dropzone.js';
4+
import {createDropzone} from './dropzone.js';
55
import {initCompColorPicker} from './comp/ColorPicker.js';
66
import {showGlobalErrorMessage} from '../bootstrap.js';
77
import {attachDropdownAria} from './aria.js';

web_src/js/features/comp/ColorPicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import $ from 'jquery';
2-
import createColorPicker from '../colorpicker.js';
2+
import {createColorPicker} from '../colorpicker.js';
33

44
export function initCompColorPicker() {
55
createColorPicker($('.color-picker'));

0 commit comments

Comments
 (0)