From: Ferdinand Thiessen Date: Thu, 23 Nov 2023 20:22:45 +0000 (+0100) Subject: fix(files): Use SVG as FilePicker icons instead of Vue components X-Git-Tag: v29.0.0beta1~797^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=de61d2a79108dff69bf5a37214364c88b768fa87;p=nextcloud-server.git fix(files): Use SVG as FilePicker icons instead of Vue components Signed-off-by: Ferdinand Thiessen --- diff --git a/apps/files/src/actions/moveOrCopyAction.ts b/apps/files/src/actions/moveOrCopyAction.ts index 07ffcfc052f..17e9370e8d9 100644 --- a/apps/files/src/actions/moveOrCopyAction.ts +++ b/apps/files/src/actions/moveOrCopyAction.ts @@ -35,9 +35,8 @@ import { translate as t } from '@nextcloud/l10n' import axios from '@nextcloud/axios' import Vue from 'vue' -import CopyIcon from 'vue-material-design-icons/FileMultiple.vue' +import CopyIconSvg from '@mdi/svg/svg/folder-multiple.svg?raw' import FolderMoveSvg from '@mdi/svg/svg/folder-move.svg?raw' -import MoveIcon from 'vue-material-design-icons/FolderMove.vue' import { MoveCopyAction, canCopy, canMove, getQueue } from './moveOrCopyActionUtils' import logger from '../logger' @@ -170,7 +169,7 @@ const openFilePickerForAction = async (action: MoveCopyAction, dir = '/', node: buttons.push({ label: target ? t('files', 'Copy to {target}', { target }) : t('files', 'Copy'), type: 'primary', - icon: CopyIcon, + icon: CopyIconSvg, async callback(destination: Node[]) { try { await handleCopyMoveNodeTo(node, destination[0], MoveCopyAction.COPY) @@ -186,12 +185,13 @@ const openFilePickerForAction = async (action: MoveCopyAction, dir = '/', node: buttons.push({ label: target ? t('files', 'Move to {target}', { target }) : t('files', 'Move'), type: action === MoveCopyAction.MOVE ? 'primary' : 'secondary', - icon: MoveIcon, + icon: FolderMoveSvg, async callback(destination: Node[]) { try { await handleCopyMoveNodeTo(node, destination[0], MoveCopyAction.MOVE) resolve(true) } catch (error) { + console.warn('got error', error) reject(error) } },