X-Git-Url: https://scm.cri.mines-paristech.fr/git/Plinn.git/blobdiff_plain/7f1004b6f23ecfab4ed24f8a8c277f2a667052a5..e311b4c86acdfe7fd6b930436d49852e5ebfc75d:/skins/fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 77d7b03..04fde67 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -49,7 +49,7 @@ DDFileUploader.prototype.handleFiles = function(files) {
 		file = files[i];
 		slide = this.createSlide(file);
         // this.previewQueuePush(slide);
-        // this.uploadQueuePush(slide);
+        this.uploadQueuePush(slide);
 	}
 };
 
@@ -63,13 +63,19 @@ 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);});
+	addListener(req, 'readystatechange',
+		function(evt) {
+			if (req.readyState == 4) {
+				self.uploadCompleteHandler(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,10 +84,11 @@ DDFileUploader.prototype.upload = function(slide) {
 	reader.readAsBinaryString(file);
 };
 
-DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
+DDFileUploader.prototype.uploadCompleteHandler = function(req) {
 	var slide = this.uploadedSlide;
 	this.uploadedSlide.removeChild(slide.label);
     this.uploadedSlide.removeChild(slide.progressBar);
+	slide.innerHTML = req.responseXML.documentElement.firstChild.data;
 	this.uploadQueueLoadNext();
 };