From 50d5b91794bece5ceae1b9466d00c13b0c6334ca Mon Sep 17 00:00:00 2001
From: Tamara Steinwender <tamara.steinwender@tugraz.at>
Date: Wed, 9 Sep 2020 11:23:53 +0200
Subject: [PATCH] Fix timing issue of abort button
---
.../file-handling/src/dbp-nextcloud-file-picker.js | 10 ++++++++--
1 file 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 c386e7d4..8e17f807 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -498,6 +498,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
this.abortUpload = false;
this.abortUploadButton = false;
this.forAll = false;
+ this.loading = false;
this.statusText = i18n.t('nextcloud-file-picker.abort-message');
this._("#replace_mode_all").checked = false;
return;
@@ -559,6 +560,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
this.abortUpload = false;
this.abortUploadButton = false;
this.forAll = false;
+ this.loading = false;
this.statusText = i18n.t('nextcloud-file-picker.abort-message');
this._("#replace_mode_all").checked = false;
return;
@@ -977,6 +979,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
${commonStyles.getModalDialogCSS()}
${commonStyles.getRadioAndCheckboxCss()}
+ .visible {
+ display: unset;
+ }
+
.block {
margin-bottom: 10px;
}
@@ -1484,11 +1490,11 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
<div class="nextcloud-footer ${classMap({hidden: !this.isPickerActive})}">
<div class="nextcloud-footer-grid">
- <button id="download-button" class="button select-button is-primary ${classMap({hidden: (!this.directoriesOnly || this.directoriesOnly && this.abortUploadButton && this.forAll)})}"
+ <button id="download-button" class="button select-button is-primary ${classMap({hidden: ((!this.directoriesOnly) || (this.directoriesOnly && this.abortUploadButton && this.forAll))})}"
@click="${() => { this.sendDirectory(this.tabulatorTable.getSelectedData()); }}">${this.folderIsSelected}</button>
<button class="button select-button is-primary ${classMap({hidden: this.directoriesOnly})}"
@click="${() => { this.downloadFiles(this.tabulatorTable.getSelectedData()); }}">${i18n.t('nextcloud-file-picker.select-files')}</button>
- <button id="abortButton" class="button select-button ${classMap({hidden: (!this.abortUploadButton && !this.forAll)})}"
+ <button id="abortButton" class="button select-button hidden ${classMap({"visible": (this.directoriesOnly && this.forAll && this.abortUploadButton)})}"
title="${i18n.t('nextcloud-file-picker.abort')}" @click="${() => { this.abortUpload = true; }}">${i18n.t('nextcloud-file-picker.abort')}</button>
<div class="block info-box ${classMap({hidden: this.statusText === ""})}">
--
GitLab