Skip to content
Snippets Groups Projects
Commit 50d5b917 authored by Steinwender, Tamara's avatar Steinwender, Tamara
Browse files

Fix timing issue of abort button

parent 9e2d2c81
No related branches found
No related tags found
No related merge requests found
...@@ -498,6 +498,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { ...@@ -498,6 +498,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
this.abortUpload = false; this.abortUpload = false;
this.abortUploadButton = false; this.abortUploadButton = false;
this.forAll = false; this.forAll = false;
this.loading = false;
this.statusText = i18n.t('nextcloud-file-picker.abort-message'); this.statusText = i18n.t('nextcloud-file-picker.abort-message');
this._("#replace_mode_all").checked = false; this._("#replace_mode_all").checked = false;
return; return;
...@@ -559,6 +560,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { ...@@ -559,6 +560,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
this.abortUpload = false; this.abortUpload = false;
this.abortUploadButton = false; this.abortUploadButton = false;
this.forAll = false; this.forAll = false;
this.loading = false;
this.statusText = i18n.t('nextcloud-file-picker.abort-message'); this.statusText = i18n.t('nextcloud-file-picker.abort-message');
this._("#replace_mode_all").checked = false; this._("#replace_mode_all").checked = false;
return; return;
...@@ -977,6 +979,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { ...@@ -977,6 +979,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
${commonStyles.getModalDialogCSS()} ${commonStyles.getModalDialogCSS()}
${commonStyles.getRadioAndCheckboxCss()} ${commonStyles.getRadioAndCheckboxCss()}
.visible {
display: unset;
}
.block { .block {
margin-bottom: 10px; margin-bottom: 10px;
} }
...@@ -1484,11 +1490,11 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { ...@@ -1484,11 +1490,11 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
<div class="nextcloud-footer ${classMap({hidden: !this.isPickerActive})}"> <div class="nextcloud-footer ${classMap({hidden: !this.isPickerActive})}">
<div class="nextcloud-footer-grid"> <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> @click="${() => { this.sendDirectory(this.tabulatorTable.getSelectedData()); }}">${this.folderIsSelected}</button>
<button class="button select-button is-primary ${classMap({hidden: this.directoriesOnly})}" <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> @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> 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 === ""})}"> <div class="block info-box ${classMap({hidden: this.statusText === ""})}">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment