From a3196ab6b5932b9890d9674cae930f1e639b0e3b Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 13 Mar 2013 11:46:50 +0000
Subject: [PATCH] BIS-151 SP-514 : Added oncomplete event handler to the
createSessionWorkspaceUploader methods
SVN: 28606
---
.../cisd/openbis/public/resources/js-new/openbis.js | 7 ++++---
.../systemsx/cisd/openbis/public/resources/js/openbis.js | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js-new/openbis.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js-new/openbis.js
index 5a394a6b5b5..8ed25dcd20a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js-new/openbis.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js-new/openbis.js
@@ -1227,15 +1227,15 @@ openbis.prototype.getDownloadUrlForFileForDataSetWithTimeout = function(dataSetC
* Creates a session workspace file uploader inside the specified uploaderContainer element and for the default data store.
* @method
*/
-openbis.prototype.createSessionWorkspaceUploader = function(uploaderContainer){
- this.createSessionWorkspaceUploaderForDataStore(uploaderContainer, null);
+openbis.prototype.createSessionWorkspaceUploader = function(uploaderContainer, oncomplete){
+ this.createSessionWorkspaceUploaderForDataStore(uploaderContainer, null, oncomplete);
}
/**
* Creates a session workspace file uploader inside the specified uploaderContainer element and for the specified data store.
* @method
*/
-openbis.prototype.createSessionWorkspaceUploaderForDataStore = function(uploaderContainer, dataStoreCodeOrNull){
+openbis.prototype.createSessionWorkspaceUploaderForDataStore = function(uploaderContainer, dataStoreCodeOrNull, oncomplete){
var uploaderSupported = window.File && window.FileReader && window.XMLHttpRequest;
if(!uploaderSupported){
@@ -1260,6 +1260,7 @@ openbis.prototype.createSessionWorkspaceUploaderForDataStore = function(uploader
file_upload_url: dataStoreUrl + "/session_workspace_file_upload",
form_upload_url: dataStoreUrl + "/session_workspace_form_upload",
file_download_url: dataStoreUrl + "/session_workspace_file_download",
+ oncomplete: oncomplete,
sessionID: $this.getSession()
});
});
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis.js
index 6347abc17e7..3e345ba1f96 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis.js
@@ -380,7 +380,7 @@ openbis.prototype.setWebAppSettings = function(webappSettings, action) {
*
* @method
*/
-openbis.prototype.createSessionWorkspaceUploader = function(uploaderContainer){
+openbis.prototype.createSessionWorkspaceUploader = function(uploaderContainer, oncomplete){
var uploaderSupported = window.File && window.FileReader && window.XMLHttpRequest;
if(!uploaderSupported){
@@ -404,9 +404,10 @@ openbis.prototype.createSessionWorkspaceUploader = function(uploaderContainer){
file_upload_url: $this.dssUrl + "/session_workspace_file_upload",
form_upload_url: $this.dssUrl + "/session_workspace_form_upload",
file_download_url: $this.dssUrl + "/session_workspace_file_download",
+ oncomplete: oncomplete,
sessionID: $this.sessionToken
});
- });
+ });
}
/**
--
GitLab