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 5a394a6b5b54872bfe5dfc4361ffb7be4091a5c7..8ed25dcd20a196738a9913add7f9d336637774aa 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 6347abc17e7eacae8be9350ee67d0007b0adf454..3e345ba1f968b4d8b9b95d7339999edcda67aec8 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 }); - }); + }); } /**