diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue index 256f9361ec0..2dc71799b93 100644 --- a/apps/files/src/components/FilesListVirtual.vue +++ b/apps/files/src/components/FilesListVirtual.vue @@ -428,8 +428,7 @@ export default defineComponent({ } if (event.key !== 'ArrowUp' && event.key !== 'ArrowDown' - && (!this.userConfig.grid_view || (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight')) - ) { + && (!this.userConfig.grid_view || (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight'))) { // not an arrow key we handle return } diff --git a/apps/files/src/components/FilesNavigationListItem.vue b/apps/files/src/components/FilesNavigationListItem.vue index a4bda51a191..f5f2bf01156 100644 --- a/apps/files/src/components/FilesNavigationListItem.vue +++ b/apps/files/src/components/FilesNavigationListItem.vue @@ -141,7 +141,7 @@ export default { allow-collapse :loading="isLoading" :data-cy-files-navigation-item="view.id" - :exact="hasChildViews /* eslint-disable-line @nextcloud/vue/no-deprecated-props */" + :exact="hasChildViews" :name="view.name" :open="isExpanded" :pinned="view.sticky" diff --git a/apps/files/src/composables/usePreviewImage.ts b/apps/files/src/composables/usePreviewImage.ts index c13d17f873e..692474113ae 100644 --- a/apps/files/src/composables/usePreviewImage.ts +++ b/apps/files/src/composables/usePreviewImage.ts @@ -38,8 +38,7 @@ export function usePreviewImage( const fallback = toValue(options).fallback ?? true if (source.attributes['has-preview'] !== true && source.mime !== undefined - && source.mime !== 'application/octet-stream' - ) { + && source.mime !== 'application/octet-stream') { if (!fallback) { return } diff --git a/apps/files/src/store/renaming.ts b/apps/files/src/store/renaming.ts index 9128773f9e0..c3761a9b0da 100644 --- a/apps/files/src/store/renaming.ts +++ b/apps/files/src/store/renaming.ts @@ -66,8 +66,7 @@ export const useRenamingStore = defineStore('renaming', () => { // Check for extension change for files if (node.type === FileType.File && oldExtension !== newExtension - && !(await showFileExtensionDialog(oldExtension, newExtension)) - ) { + && !(await showFileExtensionDialog(oldExtension, newExtension))) { // user selected to use the old extension newName = basename(newName, newExtension) + oldExtension if (oldName === newName) { @@ -78,8 +77,7 @@ export const useRenamingStore = defineStore('renaming', () => { if (!userConfig.userConfig.show_hidden && newName.startsWith('.') && !oldName.startsWith('.') - && !(await showHiddenFileDialog(newName)) - ) { + && !(await showHiddenFileDialog(newName))) { return false } } diff --git a/apps/files/src/utils/permissions.ts b/apps/files/src/utils/permissions.ts index 17339cfc630..5e07f6eb40e 100644 --- a/apps/files/src/utils/permissions.ts +++ b/apps/files/src/utils/permissions.ts @@ -21,8 +21,7 @@ export function isDownloadable(node: INode): boolean { // check hide-download property of shares if (node.attributes['hide-download'] === true - || node.attributes['hide-download'] === 'true' - ) { + || node.attributes['hide-download'] === 'true') { return false } diff --git a/build/eslint-baseline-legacy.json b/build/eslint-baseline-legacy.json index 575c034981e..67d17c73b4f 100644 --- a/build/eslint-baseline-legacy.json +++ b/build/eslint-baseline-legacy.json @@ -1,11 +1,11 @@ { - "apps/files/src/components/FilesNavigationItem.vue": { - "@nextcloud/vue/no-deprecated-props": { + "apps/files/src/components/FilesNavigationListItem.vue": { + "@nextcloud/no-deprecated-library-props": { "count": 1 } }, "apps/files/src/components/TransferOwnershipDialogue.vue": { - "@nextcloud/vue/no-deprecated-props": { + "@nextcloud/no-deprecated-library-props": { "count": 1 } }, @@ -15,7 +15,7 @@ } }, "apps/files_sharing/src/components/SharingInput.vue": { - "@nextcloud/vue/no-deprecated-props": { + "@nextcloud/no-deprecated-library-props": { "count": 1 } }, @@ -30,12 +30,12 @@ } }, "apps/settings/src/components/GroupListItem.vue": { - "@nextcloud/vue/no-deprecated-props": { + "@nextcloud/no-deprecated-library-props": { "count": 1 } }, "apps/settings/src/components/Users/NewUserDialog.vue": { - "@nextcloud/vue/no-deprecated-props": { + "@nextcloud/no-deprecated-library-props": { "count": 1 }, "vue/no-mutating-props": { @@ -43,7 +43,7 @@ } }, "apps/settings/src/views/UserManagementNavigation.vue": { - "@nextcloud/vue/no-deprecated-props": { + "@nextcloud/no-deprecated-library-props": { "count": 4 } }, diff --git a/core/src/globals.js b/core/src/globals.js index 01569fef018..be835c171a8 100644 --- a/core/src/globals.js +++ b/core/src/globals.js @@ -1,10 +1,9 @@ -/** +/* eslint-disable @nextcloud/no-deprecated-globals */ +/*! * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ -/* eslint-disable @nextcloud/no-deprecations */ -// END TODO import Backbone from 'backbone' import ClipboardJS from 'clipboard' import { dav } from 'davclient.js' @@ -43,9 +42,9 @@ function warnIfNotTesting() { * Mark a function as deprecated and automatically * warn if used! * - * @param {Function} func the library to deprecate - * @param {string} funcName the name of the library - * @param {number} version the version this gets removed + * @param {Function} func - The library to deprecate + * @param {string} funcName - The name of the library + * @param {number} version - The version this gets removed * @return {Function} */ function deprecate(func, funcName, version) { @@ -59,10 +58,11 @@ function deprecate(func, funcName, version) { } /** + * Mark a global variable as deprecated and automatically * - * @param global - * @param cb - * @param msg + * @param global - the global variable to deprecate, can be a string or an array of strings + * @param cb - a callback that returns the value of the global variable, this is needed to avoid circular dependencies + * @param msg - an optional message to show in the warning, e.g. to suggest an alternative, this will be appended to the default warning message */ function setDeprecatedProp(global, cb, msg) { (Array.isArray(global) ? global : [global]).forEach((global) => {