commit: d9aca590bbee3b416e362fc8ada93a66cdbebbe0 parent bb2de0f56789f19be92dda03c458d9573832b092 Author: Henry Jameson <me@hjkos.com> Date: Tue, 4 Feb 2025 14:14:31 +0200 eslint --fixDiffstat:
38 files changed, 62 insertions(+), 62 deletions(-)diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue@@ -238,8 +238,8 @@ ref="flash" class="flash" :src="attachment.large_thumb_url || attachment.url" - @playerOpened="setFlashLoaded(true)" - @playerClosed="setFlashLoaded(false)" + @player-opened="setFlashLoaded(true)" + @player-closed="setFlashLoaded(false)" /> </span> </div>diff --git a/src/components/color_input/color_input.vue b/src/components/color_input/color_input.vue@@ -15,7 +15,7 @@ :model-value="present" :disabled="disabled" class="opt" - @update:modelValue="updateValue(typeof modelValue === 'undefined' ? fallback : undefined)" + @update:model-value="updateValue(typeof modelValue === 'undefined' ? fallback : undefined)" /> <div class="input color-input-field"diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js@@ -272,11 +272,11 @@ const conversation = { }, replies () { let i = 1 - // eslint-disable-next-line camelcase + return reduce(this.conversation, (result, { id, in_reply_to_status_id }) => { - /* eslint-disable camelcase */ + const irid = in_reply_to_status_id - /* eslint-enable camelcase */ + if (irid) { result[irid] = result[irid] || [] result[irid].push({diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue@@ -123,7 +123,7 @@ :controlled-set-media-playing="(newVal) => toggleStatusContentProperty(status.id, 'mediaPlaying', newVal)" @goto="setHighlight" - @toggleExpanded="toggleExpanded" + @toggle-expanded="toggleExpanded" /> <div v-if="showOtherRepliesButtonBelowStatus && getReplies(status.id).length > 1" @@ -217,7 +217,7 @@ :toggle-status-content-property="toggleStatusContentProperty" @goto="setHighlight" - @toggleExpanded="toggleExpanded" + @toggle-expanded="toggleExpanded" /> </article> </div>diff --git a/src/components/edit_status_modal/edit_status_modal.vue b/src/components/edit_status_modal/edit_status_modal.vue@@ -2,7 +2,7 @@ <Modal v-if="isFormVisible" class="edit-form-modal-view" - @backdropClicked="closeModal" + @backdrop-clicked="closeModal" > <div class="edit-form-modal-panel panel"> <div class="panel-heading">diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js@@ -116,7 +116,7 @@ export const suggestUsers = ({ dispatch, state }) => { const screenNameAlphabetically = a.screen_name > b.screen_name ? 1 : -1 return diff + nameAlphabetically + screenNameAlphabetically - /* eslint-disable camelcase */ + }).map((user) => ({ user, displayText: user.screen_name_ui, @@ -124,7 +124,7 @@ export const suggestUsers = ({ dispatch, state }) => { imageUrl: user.profile_image_url_original, replacement: '@' + user.screen_name + ' ' })) - /* eslint-enable camelcase */ + suggestions = newSuggestions || [] return suggestionsdiff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue@@ -86,7 +86,7 @@ :id="name + '-local-font-switcher'" :model-value="modelValue?.family" class="custom-font" - @update:modelValue="v => $emit('update:modelValue', { ...(modelValue || {}), family: v })" + @update:model-value="v => $emit('update:modelValue', { ...(modelValue || {}), family: v })" > <optgroup :label="$t('settings.style.themes3.font.group-builtin')"diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue@@ -32,8 +32,8 @@ :description="descriptions && descriptions[attachment.id]" :hide-description="size === 'small' || tooManyAttachments && hidingLong" :style="itemStyle(attachment.id, row.items)" - @setMedia="onMedia" - @naturalSizeLoad="onNaturalSizeLoad" + @set-media="onMedia" + @natural-size-load="onNaturalSizeLoad" /> </div> </div>diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue@@ -13,7 +13,7 @@ <Select class="language-select" :model-value="controlledLanguage[index]" - @update:modelValue="val => setLanguageAt(index, val)" + @update:model-value="val => setLanguageAt(index, val)" > <option v-for="lang in languages"diff --git a/src/components/lists_edit/lists_edit.vue b/src/components/lists_edit/lists_edit.vue@@ -84,7 +84,7 @@ <ListsUserSearch @results="onSearchResults" @loading="onSearchLoading" - @loadingDone="onSearchLoadingDone" + @loading-done="onSearchLoadingDone" /> <div v-if="searchLoading"diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue@@ -2,7 +2,7 @@ <Modal v-if="showing" class="media-modal-view" - @backdropClicked="hideIfNotSwiped" + @backdrop-clicked="hideIfNotSwiped" > <SwipeClick v-if="type === 'image'"diff --git a/src/components/opacity_input/opacity_input.vue b/src/components/opacity_input/opacity_input.vue@@ -15,7 +15,7 @@ :model-value="present" :disabled="disabled" class="opt" - @update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)" + @update:model-value="$emit('update:modelValue', !present ? fallback : undefined)" /> <input :id="name"diff --git a/src/components/palette_editor/palette_editor.vue b/src/components/palette_editor/palette_editor.vue@@ -10,7 +10,7 @@ :model-value="props.modelValue[key]" :fallback="fallback(key)" :label="$t('settings.style.themes3.palette.' + key)" - @update:modelValue="value => updatePalette(key, value)" + @update:model-value="value => updatePalette(key, value)" /> <button class="btn button-default palette-import-button"diff --git a/src/components/post_status_modal/post_status_modal.vue b/src/components/post_status_modal/post_status_modal.vue@@ -3,7 +3,7 @@ v-if="isLoggedIn && !resettingForm" :is-open="modalActivated" class="post-form-modal-view" - @backdropClicked="closeModal" + @backdrop-clicked="closeModal" > <div class="post-form-modal-panel panel"> <div class="panel-heading">diff --git a/src/components/remote_follow/remote_follow.js b/src/components/remote_follow/remote_follow.js@@ -2,7 +2,7 @@ export default { props: ['user'], computed: { subscribeUrl () { - // eslint-disable-next-line no-undef + const serverUrl = new URL(this.user.statusnet_profile_url) return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus` }diff --git a/src/components/roundness_input/roundness_input.vue b/src/components/roundness_input/roundness_input.vue@@ -15,7 +15,7 @@ :model-value="present" :disabled="disabled" class="opt" - @update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)" + @update:model-value="$emit('update:modelValue', !present ? fallback : undefined)" /> <input :id="name"diff --git a/src/components/settings_modal/admin_tabs/emoji_tab.vue b/src/components/settings_modal/admin_tabs/emoji_tab.vue@@ -312,8 +312,8 @@ new-upload :title="$t('admin_dash.emoji.adding_new')" :pack-name="packName" - @updatePackFiles="updatePackFiles" - @displayError="displayError" + @update-pack-files="updatePackFiles" + @display-error="displayError" > <template #trigger> <FAIcon @@ -334,8 +334,8 @@ :shortcode="shortcode" :file="file" :pack-name="packName" - @updatePackFiles="updatePackFiles" - @displayError="displayError" + @update-pack-files="updatePackFiles" + @display-error="displayError" > <template #trigger> <StillImagediff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue@@ -7,7 +7,7 @@ :model-value="visibleState" :disabled="shouldBeDisabled" :indeterminate="isIndeterminate" - @update:modelValue="update" + @update:model-value="update" > <span class="label"diff --git a/src/components/settings_modal/helpers/choice_setting.vue b/src/components/settings_modal/helpers/choice_setting.vue@@ -13,7 +13,7 @@ <Select :model-value="realDraftMode ? draft :state" :disabled="disabled" - @update:modelValue="update" + @update:model-value="update" > <option v-for="option in realOptions"diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue@@ -111,7 +111,7 @@ <Checkbox :model-value="!!expertLevel" - @update:modelValue="expertLevel = Number($event)" + @update:model-value="expertLevel = Number($event)" > {{ $t("settings.expert_mode") }} </Checkbox>diff --git a/src/components/settings_modal/tabs/appearance_tab.vue b/src/components/settings_modal/tabs/appearance_tab.vue@@ -158,7 +158,7 @@ :compact="true" :apply="true" :disabled="switchInProgress" - @applyPalette="data => setPaletteCustom(data)" + @apply-palette="data => setPaletteCustom(data)" /> </template> <template v-else-if="customThemeVersion === 'v2'"> @@ -247,7 +247,7 @@ :label="$t('settings.style.fonts.components.interface')" :fallback="{ family: 'sans-serif' }" no-inherit="1" - @update:modelValue="v => updateFont('interface', v)" + @update:model-value="v => updateFont('interface', v)" /> </li> <li> @@ -257,7 +257,7 @@ name="input" :fallback="{ family: 'inherit' }" :label="$t('settings.style.fonts.components.input')" - @update:modelValue="v => updateFont('input', v)" + @update:model-value="v => updateFont('input', v)" /> </li> <li> @@ -267,7 +267,7 @@ name="post" :fallback="{ family: 'inherit' }" :label="$t('settings.style.fonts.components.post')" - @update:modelValue="v => updateFont('post', v)" + @update:model-value="v => updateFont('post', v)" /> </li> <li> @@ -277,7 +277,7 @@ name="postCode" :fallback="{ family: 'monospace' }" :label="$t('settings.style.fonts.components.monospace')" - @update:modelValue="v => updateFont('monospace', v)" + @update:model-value="v => updateFont('monospace', v)" /> </li> <h3>{{ $t('settings.columns') }}</h3>diff --git a/src/components/settings_modal/tabs/data_import_export_tab.js b/src/components/settings_modal/tabs/data_import_export_tab.js@@ -72,7 +72,7 @@ const DataImportExportTab = { // check is it's a local user if (user && user.is_local) { // append the instance address - // eslint-disable-next-line no-undef + return user.screen_name + '@' + location.hostname } return user.screen_namediff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js@@ -85,7 +85,7 @@ const MutesAndBlocks = { // check is it's a local user if (user && user.is_local) { // append the instance address - // eslint-disable-next-line no-undef + return user.screen_name + '@' + location.hostname } return user.screen_namediff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js@@ -134,14 +134,14 @@ const ProfileTab = { note: this.newBio, locked: this.newLocked, // Backend notation. - /* eslint-disable camelcase */ + display_name: this.newName, fields_attributes: this.newFields.filter(el => el != null), actor_type: this.actorType, show_role: this.showRole, birthday: this.newBirthday || '', show_birthday: this.showBirthday - /* eslint-enable camelcase */ + } if (this.emailLanguage) { @@ -190,7 +190,7 @@ const ProfileTab = { }) return } - // eslint-disable-next-line no-undef + const reader = new FileReader() reader.onload = ({ target }) => { const img = target.resultdiff --git a/src/components/settings_modal/tabs/style_tab/style_tab.vue b/src/components/settings_modal/tabs/style_tab/style_tab.vue@@ -147,7 +147,7 @@ > <Checkbox :value="selectedState.has(state)" - @update:modelValue="(v) => updateSelectedStates(state, v)" + @update:model-value="(v) => updateSelectedStates(state, v)" > {{ state }} </Checkbox> @@ -337,7 +337,7 @@ :no-preview="true" :compact="true" :static-vars="staticVars" - @subShadowSelected="onSubShadow" + @sub-shadow-selected="onSubShadow" /> </div> </tab-switcher> @@ -373,8 +373,8 @@ :model-value="palettes" :selected-id="selectedPaletteId" :get-add-value="getNewPalette" - @update:modelValue="onPalettesUpdate" - @update:selectedId="e => selectedPaletteId = e" + @update:model-value="onPalettesUpdate" + @update:selected-id="e => selectedPaletteId = e" /> <div class="list-edit-area"> <StringSetting @@ -393,7 +393,7 @@ key="variables" :label="$t('settings.style.themes3.editor.variables_tab')" :model-value="virtualDirectives" - @update:modelValue="updateVirtualDirectives" + @update:model-value="updateVirtualDirectives" /> </tab-switcher> </div>diff --git a/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.vue b/src/components/settings_modal/tabs/style_tab/virtual_directives_tab.vue@@ -28,8 +28,8 @@ :model-value="modelValue" :selected-id="selectedVirtualDirectiveId" :get-add-value="getNewVirtualDirective" - @update:modelValue="e => emit('update:modelValue', e)" - @update:selectedId="e => selectedVirtualDirectiveId = e" + @update:model-value="e => emit('update:modelValue', e)" + @update:selected-id="e => selectedVirtualDirectiveId = e" /> <div class="list-edit-area"> <div class="variable-selector">diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue@@ -35,7 +35,7 @@ :selected-id="selectedId" :get-add-value="getNewSubshadow" :disabled="disabled" - @update:selectedId="onSelectChange" + @update:selected-id="onSelectChange" /> </div> <div class="shadow-tweak"> @@ -170,12 +170,12 @@ :fallback="getColorFallback" :show-optional-checkbox="false" name="shadow" - @update:modelValue="e => updateProperty('color', e)" + @update:model-value="e => updateProperty('color', e)" /> <OpacityInput :model-value="selected?.alpha" :disabled="disabled || !present" - @update:modelValue="e => updateProperty('alpha', e)" + @update:model-value="e => updateProperty('alpha', e)" /> <i18n-t scope="global"diff --git a/src/components/status/status.vue b/src/components/status/status.vue@@ -403,7 +403,7 @@ :controlled-toggle-showing-long-subject="controlledToggleShowingLongSubject" @mediaplay="addMediaPlaying($event)" @mediapause="removeMediaPlaying($event)" - @parseReady="setHeadTailLinks" + @parse-ready="setHeadTailLinks" /> <article @@ -539,7 +539,7 @@ v-if="!noHeading && !isPreview" :status="status" :replying="replying" - @toggleReplying="toggleReplying" + @toggle-replying="toggleReplying" /> </div> </div>diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue@@ -52,7 +52,7 @@ :faint="compact" :greentext="mergedConfig.greentext" :attentions="status.attentions" - @parseReady="onParseReady" + @parse-ready="onParseReady" /> <buttondiff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue@@ -14,7 +14,7 @@ :toggle-showing-tall="toggleShowingTall" :toggle-expanding-subject="toggleExpandingSubject" :toggle-showing-long-subject="toggleShowingLongSubject" - @parseReady="$emit('parseReady', $event)" + @parse-ready="$emit('parseReady', $event)" > <div v-if="status.poll && status.poll.options && !compact"> <Polldiff --git a/src/components/status_history_modal/status_history_modal.vue b/src/components/status_history_modal/status_history_modal.vue@@ -2,7 +2,7 @@ <Modal v-if="modalActivated" class="status-history-modal-view" - @backdropClicked="closeModal" + @backdrop-clicked="closeModal" > <div class="status-history-modal-panel panel"> <div class="panel-heading">diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue@@ -32,7 +32,7 @@ :dive="dive ? () => dive(status.id) : undefined" @goto="setHighlight" - @toggleExpanded="toggleExpanded" + @toggle-expanded="toggleExpanded" /> <div v-if="currentReplies.length && threadShowing"diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js@@ -85,7 +85,7 @@ export default { return this.user.id !== this.$store.state.users.currentUser.id }, subscribeUrl () { - // eslint-disable-next-line no-undef + const serverUrl = new URL(this.user.statusnet_profile_url) return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus` },diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue@@ -1,7 +1,7 @@ <template> <Modal v-if="isOpen" - @backdropClicked="closeModal" + @backdrop-clicked="closeModal" > <div class="user-reporting-panel panel"> <div class="panel-heading">diff --git a/src/lib/event_target_polyfill.js b/src/lib/event_target_polyfill.js@@ -1,9 +1,9 @@ import EventTargetPolyfill from '@ungap/event-target' try { - /* eslint-disable no-new */ + new EventTarget() - /* eslint-enable no-new */ + } catch (e) { window.EventTarget = EventTargetPolyfill }diff --git a/src/modules/auth_flow.js b/src/modules/auth_flow.js@@ -67,7 +67,7 @@ const mutations = { // actions const actions = { - // eslint-disable-next-line camelcase + async login ({ state, dispatch, commit }, { access_token }) { commit('setToken', access_token, { root: true }) await dispatch('loginUser', access_token, { root: true })diff --git a/src/services/export_import/export_import.js b/src/services/export_import/export_import.js@@ -42,7 +42,7 @@ export const newImporter = ({ filePicker.addEventListener('change', event => { if (event.target.files[0]) { const filename = event.target.files[0].name - // eslint-disable-next-line no-undef + const reader = new FileReader() reader.onload = ({ target }) => { try {diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js@@ -1,6 +1,6 @@ import { defaultState, mutations, prepareStatus } from '../../../../src/modules/statuses.js' -// eslint-disable-next-line camelcase + const makeMockStatus = ({ id, text, type = 'status' }) => { return { id,