X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/620ae31539db55f2603d84fc78fb2ee471c8f403..e18ffb06799dc45219773c697a04d3d86b2b7ad3:/skins/fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 8e09907..2e32fe9 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -48,8 +48,8 @@ DDFileUploader.prototype.handleFiles = function(files) {
 	for (i = 0; i < files.length; i++) {
 		file = files[i];
 		slide = this.createSlide(file);
-		this.previewQueuePush(slide);
-		this.uploadQueuePush(slide);
+        // this.previewQueuePush(slide);
+        this.uploadQueuePush(slide);
 	}
 };
 
@@ -63,13 +63,13 @@ DDFileUploader.prototype.upload = function(slide) {
 	var self = this;
 	
 	addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
-	addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);});
+	addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt, req);});
 
-	req.open("PUT", this.uploadUrl + '/' + file.name);
+	req.open("PUT", this.uploadUrl);
 	req.setRequestHeader("Content-Type", file.type);
+	req.setRequestHeader("X-File-Name", file.name);
 	addListener(reader, 'load',
 		function(evt){
-			console.info('load');
 			try {
 				req.sendAsBinary(evt.target.result);
 			}
@@ -78,11 +78,12 @@ DDFileUploader.prototype.upload = function(slide) {
 	reader.readAsBinaryString(file);
 };
 
-DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
+DDFileUploader.prototype.uploadCompleteHandler = function(evt, req) {
 	var slide = this.uploadedSlide;
 	this.uploadedSlide.removeChild(slide.label);
-	this.uploadedSlide.removeChild(slide.label);
+    this.uploadedSlide.removeChild(slide.progressBar);
 	this.uploadQueueLoadNext();
+	this.slide.innerHTML = req.responseXML.documentElement.firstChild.data;
 };
 
 DDFileUploader.prototype.progressHandler = function(evt) {