From 21894591dc49910f186046c21c1fd2ad6c815ab4 Mon Sep 17 00:00:00 2001
From: Tamara Steinwender <tamara.steinwender@tugraz.at>
Date: Mon, 19 Jul 2021 10:11:30 +0200
Subject: [PATCH] Small bugfix for file-handling
---
packages/file-handling/src/file-sink.js | 1 +
packages/file-handling/src/file-source.js | 1 +
packages/file-handling/src/nextcloud-file-picker.js | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index b4b2ed54..a3074a75 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -251,6 +251,7 @@ export class FileSink extends ScopedElementsMixin(DbpFileHandlingLitElement) {
const filePicker = this._('#clipboard-file-picker');
if (filePicker && filePicker.tabulatorTable) {
filePicker.tabulatorTable.deselectRow();
+ filePicker.numberOfSelectedFiles = 0;
if (filePicker._('#select_all')) {
filePicker._("#select_all").checked = false;
}
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index c0a8a7ba..dbac845f 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -443,6 +443,7 @@ export class FileSource extends ScopedElementsMixin(DbpFileHandlingLitElement) {
if (this.enabledTargets.includes('clipboard')) {
const filePicker = this._('#clipboard-file-picker');
if (filePicker && filePicker.tabulatorTable) {
+ filePicker.numberOfSelectedFiles = 0;
filePicker.tabulatorTable.deselectRow();
if (filePicker._('#select_all')) {
filePicker._("#select_all").checked = false;
diff --git a/packages/file-handling/src/nextcloud-file-picker.js b/packages/file-handling/src/nextcloud-file-picker.js
index 1e9e2ab2..b95a30d0 100644
--- a/packages/file-handling/src/nextcloud-file-picker.js
+++ b/packages/file-handling/src/nextcloud-file-picker.js
@@ -258,7 +258,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
} else {
this.folderIsSelected = i18n.t('nextcloud-file-picker.load-in-folder');
}
- if (this.tabulatorTable && this.tabulatorTable.getSelectedRows().filter(row => row.getData().type != 'directory' && this.checkFileType(row.getData(), this.allowedMimeTypes)).length > 0) {
+ if (!this.directoriesOnly && this.tabulatorTable && this.tabulatorTable.getSelectedRows().filter(row => row.getData().type != 'directory' && this.checkFileType(row.getData(), this.allowedMimeTypes)).length > 0) {
this.selectBtnDisabled = false;
} else {
this.selectBtnDisabled = true;
--
GitLab