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

Small fixes in file-handling

parent e79b09f1
No related branches found
No related tags found
No related merge requests found
Pipeline #45519 passed
...@@ -468,7 +468,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ...@@ -468,7 +468,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
openFilesource() { openFilesource() {
const fileSource = this._("#file-source-clipboard"); const fileSource = this._("#file-source-clipboard");
if (fileSource) { if (fileSource) {
this._("#file-source-clipboard").setAttribute("dialog-open", ""); this._("#file-source-clipboard").openDialog();
} }
} }
......
...@@ -295,10 +295,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { ...@@ -295,10 +295,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
const authUrl = this.authUrl + "?target-origin=" + encodeURIComponent(window.location.href); const authUrl = this.authUrl + "?target-origin=" + encodeURIComponent(window.location.href);
this.loginWindow = window.open(authUrl, "Nextcloud Login", this.loginWindow = window.open(authUrl, "Nextcloud Login",
"width=400,height=400,menubar=no,scrollbars=no,status=no,titlebar=no,toolbar=no"); "width=400,height=400,menubar=no,scrollbars=no,status=no,titlebar=no,toolbar=no");
console.log("open nextcloud filepicker, no webdavclient"); //console.log("open nextcloud filepicker, no webdavclient");
} else { } else {
this.loadDirectory(this.directoryPath, this.webDavClient); this.loadDirectory(this.directoryPath, this.webDavClient);
console.log("load in nextcloud webcomponent"); //console.log("load in nextcloud webcomponent");
} }
} }
...@@ -476,6 +476,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { ...@@ -476,6 +476,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
this.dispatchEvent(event); this.dispatchEvent(event);
this.loading = false; this.loading = false;
this.statusText = ""; this.statusText = "";
this.numberOfSelectedFiles = 0;
}).catch(error => { }).catch(error => {
console.error(error.message); console.error(error.message);
this.loading = false; this.loading = false;
...@@ -490,6 +491,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { ...@@ -490,6 +491,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
*/ */
sendDirectory(directory) { sendDirectory(directory) {
this.tabulatorTable.deselectRow(); this.tabulatorTable.deselectRow();
this.numberOfSelectedFiles = 0;
let path; let path;
if (!directory[0]) { if (!directory[0]) {
...@@ -792,6 +794,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { ...@@ -792,6 +794,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
} }
closeDialog(e) { closeDialog(e) {
this.numberOfSelectedFiles = 0;
MicroModal.close(this._('#modal-picker')); MicroModal.close(this._('#modal-picker'));
} }
......
...@@ -130,7 +130,7 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) { ...@@ -130,7 +130,7 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
} }
break; break;
case "files": case "files":
if (this.files.length !== 0 && !this.isDialogOpen) { if (this.files.length !== 0) {
this.openDialog(); this.openDialog();
if (this.enabledTargets.includes("clipboard")) { if (this.enabledTargets.includes("clipboard")) {
const clipboardSink = this._("#clipboard-file-picker"); const clipboardSink = this._("#clipboard-file-picker");
...@@ -203,7 +203,6 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) { ...@@ -203,7 +203,6 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
} }
openDialog() { openDialog() {
console.log("open sink");
if (this.enabledTargets.includes('nextcloud')) { if (this.enabledTargets.includes('nextcloud')) {
this.loadWebdavDirectory(); this.loadWebdavDirectory();
} }
...@@ -227,13 +226,14 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) { ...@@ -227,13 +226,14 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
} }
this.firstOpen = false; this.firstOpen = false;
} }
}
//TODO find open error!! this.isDialogOpen = true;
}
closeDialog(e) { closeDialog(e) {
this.sendDestination(); this.sendDestination();
MicroModal.close(this._('#modal-picker')); MicroModal.close(this._('#modal-picker'));
this.isDialogOpen = false;
} }
getClipboardHtml() { getClipboardHtml() {
......
...@@ -369,7 +369,6 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) { ...@@ -369,7 +369,6 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
} }
openDialog() { openDialog() {
console.log("open source");
if (this.enabledTargets.includes('nextcloud')) { if (this.enabledTargets.includes('nextcloud')) {
this.loadWebdavDirectory(); this.loadWebdavDirectory();
...@@ -413,12 +412,6 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) { ...@@ -413,12 +412,6 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
closeDialog() { closeDialog() {
this.sendSource(); this.sendSource();
const filePicker = this._('#nextcloud-file-picker');
if (filePicker) {
filePicker.selectAllButton = true;
}
MicroModal.close(this._('#modal-picker')); MicroModal.close(this._('#modal-picker'));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment