From c22b3eeee185b57c41077eeebc4fa615f6241454 Mon Sep 17 00:00:00 2001
From: Tamara Steinwender <tamara.steinwender@tugraz.at>
Date: Tue, 1 Sep 2020 10:51:13 +0200
Subject: [PATCH] Clean code
---
packages/file-handling/src/file-sink.js | 12 +++++-------
packages/file-handling/src/file-source.js | 8 ++------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index fcd06c96..b21b51e8 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -68,9 +68,9 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
let fileNames = [];
// download one file not compressed!
- if (this.files.length === 1)
- {
+ if (this.files.length === 1) {
FileSaver.saveAs(this.files[0], this.files[0].filename);
+ this.closeDialog();
return;
}
@@ -92,6 +92,8 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
// see: https://github.com/eligrey/FileSaver.js#readme
FileSaver.saveAs(content, this.filename || "files.zip");
+
+ this.closeDialog();
}
update(changedProperties) {
@@ -123,14 +125,12 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
async uploadToNextcloud(directory) {
let that = this;
const element = that._('#nextcloud-file-picker');
- console.log("davor");
await element.uploadFiles(that.files, directory);
}
finishedFileUpload(event) {
MicroModal.close(this._('#modal-picker'));
- if (event.detail > 0)
- {
+ if (event.detail > 0) {
send({
"summary": i18n.t('file-sink.upload-success-title'),
"body": i18n.t('file-sink.upload-success-body', {name: this.nextcloudName, count: event.detail}),
@@ -152,7 +152,6 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
}
openDialog() {
- console.log("openDialog");
this.loadWebdavDirectory();
MicroModal.show(this._('#modal-picker'), {
disableScroll: true,
@@ -161,7 +160,6 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
}
closeDialog(e) {
- console.log("closeDialog");
MicroModal.close(this._('#modal-picker'));
}
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index f14bf58c..ab67af30 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -145,7 +145,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
}
let dt = e.dataTransfer;
- console.dir(dt);
+ // console.dir(dt);
let files = dt.files;
this.handleFiles(files);
@@ -171,7 +171,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
* @returns {Promise<void>}
*/
async handleFiles(files) {
- console.log('handleFiles: files.length = ' + files.length);
+ // console.log('handleFiles: files.length = ' + files.length);
// this.dispatchEvent(new CustomEvent("dbp-file-source-selection-start",
// { "detail": {}, bubbles: true, composed: true }));
@@ -206,7 +206,6 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
*/
sendFileEvent(file) {
MicroModal.close(this._('#modal-picker'));
- console.log("close filesource modal.")
const data = {"file": file};
const event = new CustomEvent("dbp-file-source-file-selected", { "detail": data, bubbles: true, composed: true });
this.dispatchEvent(event);
@@ -225,7 +224,6 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
if (deny) {
console.log(`mime type ${file.type} of file '${file.name}' is not compatible with ${this.allowedMimeTypes}`);
-
return false;
}
@@ -318,7 +316,6 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
}
openDialog() {
- console.log("openDialog");
this.loadWebdavDirectory();
MicroModal.show(this._('#modal-picker'), {
disableScroll: true,
@@ -328,7 +325,6 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
}
closeDialog() {
- console.log("closeDialog");
this._('#nextcloud-file-picker').selectAllButton = true;
MicroModal.close(this._('#modal-picker'));
}
--
GitLab