diff --git a/src/components/Default.vue b/src/components/Default.vue index 8ff96ba35..1a88e4076 100644 --- a/src/components/Default.vue +++ b/src/components/Default.vue @@ -29,12 +29,12 @@ export default { computed: { mimeIcon() { - return OC.MimeType.getIconUrl(this.mime); - } + return OC.MimeType.getIconUrl(this.mime) + }, }, mounted() { - this.doneLoading(); + this.doneLoading() }, } diff --git a/src/files_actions/viewerAction.ts b/src/files_actions/viewerAction.ts index c8eb6fd65..b141a420a 100644 --- a/src/files_actions/viewerAction.ts +++ b/src/files_actions/viewerAction.ts @@ -79,10 +79,7 @@ export function registerViewerAction() { // Always enabled if configured so if (configModule.alwaysShowViewer) { // disable for folders - if (nodes.some(node => node.type === 'folder')) { - return false - } - return true + return !nodes.some(node => node.type === 'folder') } return nodes.every((node) => diff --git a/src/views/Viewer.vue b/src/views/Viewer.vue index 14c58f209..cf254d887 100644 --- a/src/views/Viewer.vue +++ b/src/views/Viewer.vue @@ -741,11 +741,11 @@ export default defineComponent({ // and office documents/pdfs to exclude collabora files // otherwise accept all mimes filteredFiles = fileList.filter(file => { - const mime = file?.mime; - const isOfficeDocument = mime && OC.MimeTypeList.aliases[mime]?.startsWith('x-office'); - const isPdf = mime && mime === 'application/pdf'; + const mime = file?.mime + const isOfficeDocument = mime && OC.MimeTypeList.aliases[mime]?.startsWith('x-office') + const isPdf = mime && mime === 'application/pdf' - return mime && !isOfficeDocument && !isPdf; + return mime && !isOfficeDocument && !isPdf }) } else { // filter out the unwanted mimes @@ -990,9 +990,6 @@ export default defineComponent({ if (nodes.some(node => !(node.isDavRessource && node.root?.startsWith('/files')))) { return false } - - - // Faster to check if at least one node doesn't match the requirements return !nodes.some(node => ( (node.permissions & Permission.READ) === 0