Skip to content

Commit 0dc7add

Browse files
committed
chore: fix ESLint issues reported because of config update
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent 6db75dc commit 0dc7add

7 files changed

Lines changed: 18 additions & 24 deletions

File tree

apps/files/src/components/FilesListVirtual.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,7 @@ export default defineComponent({
428428
}
429429
430430
if (event.key !== 'ArrowUp' && event.key !== 'ArrowDown'
431-
&& (!this.userConfig.grid_view || (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight'))
432-
) {
431+
&& (!this.userConfig.grid_view || (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight'))) {
433432
// not an arrow key we handle
434433
return
435434
}

apps/files/src/components/FilesNavigationListItem.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export default {
141141
allow-collapse
142142
:loading="isLoading"
143143
:data-cy-files-navigation-item="view.id"
144-
:exact="hasChildViews /* eslint-disable-line @nextcloud/vue/no-deprecated-props */"
144+
:exact="hasChildViews"
145145
:name="view.name"
146146
:open="isExpanded"
147147
:pinned="view.sticky"

apps/files/src/composables/usePreviewImage.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ export function usePreviewImage(
3838
const fallback = toValue(options).fallback ?? true
3939
if (source.attributes['has-preview'] !== true
4040
&& source.mime !== undefined
41-
&& source.mime !== 'application/octet-stream'
42-
) {
41+
&& source.mime !== 'application/octet-stream') {
4342
if (!fallback) {
4443
return
4544
}

apps/files/src/store/renaming.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ export const useRenamingStore = defineStore('renaming', () => {
6666
// Check for extension change for files
6767
if (node.type === FileType.File
6868
&& oldExtension !== newExtension
69-
&& !(await showFileExtensionDialog(oldExtension, newExtension))
70-
) {
69+
&& !(await showFileExtensionDialog(oldExtension, newExtension))) {
7170
// user selected to use the old extension
7271
newName = basename(newName, newExtension) + oldExtension
7372
if (oldName === newName) {
@@ -78,8 +77,7 @@ export const useRenamingStore = defineStore('renaming', () => {
7877
if (!userConfig.userConfig.show_hidden
7978
&& newName.startsWith('.')
8079
&& !oldName.startsWith('.')
81-
&& !(await showHiddenFileDialog(newName))
82-
) {
80+
&& !(await showHiddenFileDialog(newName))) {
8381
return false
8482
}
8583
}

apps/files/src/utils/permissions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ export function isDownloadable(node: INode): boolean {
2121

2222
// check hide-download property of shares
2323
if (node.attributes['hide-download'] === true
24-
|| node.attributes['hide-download'] === 'true'
25-
) {
24+
|| node.attributes['hide-download'] === 'true') {
2625
return false
2726
}
2827

build/eslint-baseline-legacy.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"apps/files/src/components/FilesNavigationItem.vue": {
3-
"@nextcloud/vue/no-deprecated-props": {
2+
"apps/files/src/components/FilesNavigationListItem.vue": {
3+
"@nextcloud/no-deprecated-library-props": {
44
"count": 1
55
}
66
},
77
"apps/files/src/components/TransferOwnershipDialogue.vue": {
8-
"@nextcloud/vue/no-deprecated-props": {
8+
"@nextcloud/no-deprecated-library-props": {
99
"count": 1
1010
}
1111
},
@@ -15,7 +15,7 @@
1515
}
1616
},
1717
"apps/files_sharing/src/components/SharingInput.vue": {
18-
"@nextcloud/vue/no-deprecated-props": {
18+
"@nextcloud/no-deprecated-library-props": {
1919
"count": 1
2020
}
2121
},
@@ -30,20 +30,20 @@
3030
}
3131
},
3232
"apps/settings/src/components/GroupListItem.vue": {
33-
"@nextcloud/vue/no-deprecated-props": {
33+
"@nextcloud/no-deprecated-library-props": {
3434
"count": 1
3535
}
3636
},
3737
"apps/settings/src/components/Users/NewUserDialog.vue": {
38-
"@nextcloud/vue/no-deprecated-props": {
38+
"@nextcloud/no-deprecated-library-props": {
3939
"count": 1
4040
},
4141
"vue/no-mutating-props": {
4242
"count": 17
4343
}
4444
},
4545
"apps/settings/src/views/UserManagementNavigation.vue": {
46-
"@nextcloud/vue/no-deprecated-props": {
46+
"@nextcloud/no-deprecated-library-props": {
4747
"count": 4
4848
}
4949
},

core/src/globals.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/**
1+
/* eslint-disable @nextcloud/no-deprecated-globals */
2+
/*!
23
* SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
34
* SPDX-License-Identifier: AGPL-3.0-or-later
45
*/
56

6-
/* eslint-disable @nextcloud/no-deprecations */
77
import ClipboardJS from 'clipboard'
88
import { dav } from 'davclient.js'
99
import Handlebars from 'handlebars'
@@ -26,10 +26,9 @@ function warnIfNotTesting() {
2626
}
2727

2828
/**
29-
*
30-
* @param global
31-
* @param cb
32-
* @param msg
29+
* @param {string|string[]} global - a string or array of strings with the name of the global variable(s) to deprecate
30+
* @param {function} cb - a callback that returns the value of the global variable when accessed
31+
* @param {string} msg - an optional message to show in the warning
3332
*/
3433
function setDeprecatedProp(global, cb, msg) {
3534
(Array.isArray(global) ? global : [global]).forEach((global) => {

0 commit comments

Comments
 (0)