From f6730e0481ca11c211f1863d5f9388c4d3f08bc6 Mon Sep 17 00:00:00 2001 From: filippofinke Date: Thu, 17 Feb 2022 21:58:12 +0100 Subject: [PATCH] refactor: remove old uploadFiles prompt --- frontend/src/components/prompts/Prompts.vue | 3 --- frontend/src/views/files/Listing.vue | 19 +++++++------------ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/prompts/Prompts.vue b/frontend/src/components/prompts/Prompts.vue index 937e6232..36cb0349 100644 --- a/frontend/src/components/prompts/Prompts.vue +++ b/frontend/src/components/prompts/Prompts.vue @@ -19,7 +19,6 @@ import Replace from "./Replace"; import ReplaceRename from "./ReplaceRename"; import Share from "./Share"; import Upload from "./Upload"; -import UploadFiles from "./UploadFiles"; import ShareDelete from "./ShareDelete"; import { mapState } from "vuex"; import buttons from "@/utils/buttons"; @@ -41,7 +40,6 @@ export default { ReplaceRename, Upload, ShareDelete, - UploadFiles, }, data: function () { return { @@ -101,7 +99,6 @@ export default { "replace-rename", "share", "upload", - "uploadFiles", "share-delete", ].indexOf(this.show) >= 0; diff --git a/frontend/src/views/files/Listing.vue b/frontend/src/views/files/Listing.vue index ef185fe4..fac8608f 100644 --- a/frontend/src/views/files/Listing.vue +++ b/frontend/src/views/files/Listing.vue @@ -69,7 +69,6 @@ icon="file_upload" id="upload-button" :label="$t('buttons.upload')" - :counter="filesInUploadCount" @action="upload" /> @@ -300,7 +299,7 @@ export default { "selected", "loading", ]), - ...mapGetters(["selectedCount", "filesInUploadCount"]), + ...mapGetters(["selectedCount"]), nameSorted() { return this.req.sorting.by === "name"; }, @@ -837,17 +836,13 @@ export default { this.fillWindow(); }, upload: function () { - if (this.filesInUploadCount > 0) { - this.$store.commit("showHover", "uploadFiles"); + if ( + typeof window.DataTransferItem !== "undefined" && + typeof DataTransferItem.prototype.webkitGetAsEntry !== "undefined" + ) { + this.$store.commit("showHover", "upload"); } else { - if ( - typeof window.DataTransferItem !== "undefined" && - typeof DataTransferItem.prototype.webkitGetAsEntry !== "undefined" - ) { - this.$store.commit("showHover", "upload"); - } else { - document.getElementById("upload-input").click(); - } + document.getElementById("upload-input").click(); } }, setItemWeight() {