From 5575fa76ac9e50e95034b7eee0f2e78f08cfd38e Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Mon, 15 Nov 2021 15:53:02 -0400 Subject: [PATCH] don't show spinner in case cancelled and can't remove --- navigator/components/NavDragDrop.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/navigator/components/NavDragDrop.js b/navigator/components/NavDragDrop.js index 31fea20..62f7941 100644 --- a/navigator/components/NavDragDrop.js +++ b/navigator/components/NavDragDrop.js @@ -47,9 +47,10 @@ export class NavDragDrop { uploader.using_webkit = false; uploads.push(uploader); } - uploads = await this.handle_conflicts(uploads); - this.upload_manager.add(... uploads); - this.nav_window_ref.stop_load(); + if (uploads.length) { + uploads = await this.handle_conflicts(uploads); + this.upload_manager.add(... uploads); + } } document.getElementById("nav-upload-btn").addEventListener("click", this.upload_dialog.bind(this)); } @@ -213,7 +214,6 @@ export class NavDragDrop { } upload_dialog() { - this.nav_window_ref.start_load(); this.upload_element.click(); } }