commit: 0a5de96f36928cc940dbc9b0ac0790f0e50c3806
parent 8add8da27940515bbd6b045420676a1a76bf63c9
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Mon, 20 Jan 2025 11:49:55 +0000
Merge branch 'renovate/eslint-config-standard-17.x' into 'develop'
Update dependency eslint-config-standard to v17.1.0
See merge request pleroma/pleroma-fe!1994
Diffstat:
11 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
"css-minimizer-webpack-plugin": "4.2.2",
"custom-event-polyfill": "1.0.7",
"eslint": "8.57.1",
- "eslint-config-standard": "17.0.0",
+ "eslint-config-standard": "17.1.0",
"eslint-formatter-friendly": "7.0.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-n": "15.6.1",
diff --git a/src/components/draft/draft.vue b/src/components/draft/draft.vue
@@ -34,7 +34,10 @@
</i>
</p>
<p v-if="draft.status">{{ draft.status }}</p>
- <p v-else class="faint">{{ $t('drafts.empty') }}</p>
+ <p
+ v-else
+ class="faint"
+ >{{ $t('drafts.empty') }}</p>
</span>
<gallery
v-if="draft.files?.length !== 0"
diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
@@ -10,8 +10,8 @@
{{ ' ' }}
<Checkbox
v-if="typeof fallback !== 'undefined'"
- class="font-checkbox"
:id="name + '-o'"
+ class="font-checkbox"
:model-value="present"
@change="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
>
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
@@ -80,7 +80,7 @@ const mediaUpload = {
canvas.toBlob((blob) => {
resolve(new File([blob], newFileName, {
- type: type,
+ type,
lastModified: Date.now()
}))
}, type, 0.85)
diff --git a/src/components/palette_editor/palette_editor.vue b/src/components/palette_editor/palette_editor.vue
@@ -29,9 +29,9 @@
<button
v-if="apply"
class="btn button-default palette-apply-button"
- @click="applyPalette"
:disabled="disabled"
:class="{ disabled }"
+ @click="applyPalette"
>
{{ $t('settings.style.themes3.palette.apply') }}
</button>
diff --git a/src/components/settings_modal/tabs/appearance_tab.vue b/src/components/settings_modal/tabs/appearance_tab.vue
@@ -12,9 +12,9 @@
<button
class="button-default theme-preview"
data-theme-key="stock"
- @click="resetTheming"
:class="{ toggled: isStyleActive('stock'), disabled: switchInProgress }"
:disabled="switchInProgress"
+ @click="resetTheming"
>
<!-- eslint-disable vue/no-v-text-v-html-on-component -->
<!-- eslint-disable vue/no-v-html -->
@@ -58,8 +58,8 @@
:data-theme-key="style.key"
class="button-default theme-preview"
:class="{ toggled: isThemeActive(style.key), disabled: switchInProgress }"
- @click="style.version === 'v2' ? setTheme(style.key) : setStyle(style.key)"
:disabled="switchInProgress"
+ @click="style.version === 'v2' ? setTheme(style.key) : setStyle(style.key)"
>
<!-- eslint-disable vue/no-v-text-v-html-on-component -->
<!-- eslint-disable vue/no-v-html -->
@@ -81,9 +81,9 @@
<div class="import-file-container">
<button
class="btn button-default"
- @click="importFile"
:class="{ disabled: switchInProgress }"
:disabled="switchInProgress"
+ @click="importFile"
>
<FAIcon icon="folder-open" />
{{ $t('settings.style.themes3.editor.load_style') }}
@@ -157,8 +157,8 @@
class="userPalette"
:compact="true"
:apply="true"
- @applyPalette="data => setPaletteCustom(data)"
:disabled="switchInProgress"
+ @applyPalette="data => setPaletteCustom(data)"
/>
</template>
<template v-else-if="customThemeVersion === 'v2'">
diff --git a/src/components/video_attachment/video_attachment.js b/src/components/video_attachment/video_attachment.js
@@ -1,4 +1,3 @@
-
const VideoAttachment = {
props: ['attachment', 'controls'],
data () {
diff --git a/src/services/gesture_service/gesture_service.js b/src/services/gesture_service/gesture_service.js
@@ -1,4 +1,3 @@
-
const DIRECTION_LEFT = [-1, 0]
const DIRECTION_RIGHT = [1, 0]
const DIRECTION_UP = [0, -1]
diff --git a/src/services/promise_interval/promise_interval.js b/src/services/promise_interval/promise_interval.js
@@ -1,4 +1,3 @@
-
// promiseInterval - replacement for setInterval for promises, starts counting
// the interval only after a promise is done instead of immediately.
// - promiseCall is a function that returns a promise, it's called the first
diff --git a/src/services/window_utils/window_utils.js b/src/services/window_utils/window_utils.js
@@ -1,4 +1,3 @@
-
export const windowWidth = () =>
window.innerWidth ||
document.documentElement.clientWidth ||
diff --git a/yarn.lock b/yarn.lock
@@ -3864,10 +3864,10 @@ escodegen@^2.0.0:
optionalDependencies:
source-map "~0.6.1"
-eslint-config-standard@17.0.0:
- version "17.0.0"
- resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz#fd5b6cf1dcf6ba8d29f200c461de2e19069888cf"
- integrity sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==
+eslint-config-standard@17.1.0:
+ version "17.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz#40ffb8595d47a6b242e07cbfd49dc211ed128975"
+ integrity sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==
eslint-formatter-friendly@7.0.0:
version "7.0.0"