From f95567493c3c0d2a9ff9dadbfc21e0ee3cc5c4d8 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 26 Feb 2014 09:59:33 +0000
Subject: [PATCH] BIS-627 / SP-1141: ELN UI - Improve Workspace Uploader (Fix
deleting when uploading)
SVN: 30603
---
.../openbis/public/resources/uploader/js/src/upload.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/js/src/upload.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/js/src/upload.js
index 336098e6538..390192120f1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/js/src/upload.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/uploader/js/src/upload.js
@@ -269,9 +269,13 @@ var Uploader = new function () {
"<span id=\"speed-" + id + "\">? KB/s</span>)" +
"</li>");
$("#delete-"+id).click(function() {
- var fileData = file;
- $( "#upload-"+id).remove();
- settings.ondelete(fileData);
+ if(!progress[id]) {
+ var fileData = file;
+ $( "#upload-"+id).remove();
+ settings.ondelete(fileData);
+ } else {
+ alert("The upload is in progress, please wait.");
+ }
});
$("#upload-" + id).addClass("starting");
--
GitLab