From cae8e2b25c1879e2b173c2658e6fd91b43be4233 Mon Sep 17 00:00:00 2001
From: Tamara Steinwender <tamara.steinwender@tugraz.at>
Date: Mon, 25 Jan 2021 13:50:49 +0100
Subject: [PATCH] Sync filesource and filesink
---
packages/file-handling/src/dbp-nextcloud-file-picker.js | 2 +-
packages/file-handling/src/file-sink.js | 3 +++
packages/file-handling/src/file-source.js | 5 ++++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js
index 20e96691..aff565dd 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -357,7 +357,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
" </d:prop>" +
"</d:propfind>"})
.then(contents => {
- console.log("------", contents);
+ //console.log("------", contents);
this.loading = false;
this.statusText = "";
this.tabulatorTable.setData(contents.data);
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index 83eda156..027cbf53 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -197,6 +197,9 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
if (this.defaultSink !== '' && this.firstOpen) {
this.activeDestination = this.defaultSink;
this.nextcloudDir = this.nextcloudDefaultDir;
+ if (this._('#nextcloud-file-picker').webDavClient !== null) {
+ this._('#nextcloud-file-picker').loadDirectory(this.nextcloudDefaultDir);
+ }
this.firstOpen = false;
}
}
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index 13e018a2..65cbd053 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -350,7 +350,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
const filePicker = this._('#modal-picker');
- // check if element is already in the dom (for example if "dialog-open" attribute is set)
+ // check if element is already^ in the dom (for example if "dialog-open" attribute is set)
if (filePicker) {
MicroModal.show(filePicker, {
disableScroll: true,
@@ -364,6 +364,9 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
if (this.defaultSink !== '' && this.firstOpen) {
this.activeDestination = this.defaultSink;
this.nextcloudDir = this.nextcloudDefaultDir;
+ if (this._('#nextcloud-file-picker').webDavClient !== null) {
+ this._('#nextcloud-file-picker').loadDirectory(this.nextcloudDefaultDir);
+ }
this.firstOpen = false;
}
}
--
GitLab