X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/18ed8263755a35f5206a4a7205745f269b69bb06..0a4f1d633da324fd2da03cfbadadef0d8d7e3a3c:/skins/fileupload.js?ds=inline

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 7229df9..0d2ce8c 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -48,10 +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.previewUploadedImage(file);
-		// this.upload(file);
+        // this.previewQueuePush(slide);
+        this.uploadQueuePush(slide);
 	}
 };
 
@@ -59,6 +57,7 @@ DDFileUploader.prototype.upload = function(slide) {
 	var reader = new FileReader();
 	var req = new XMLHttpRequest();
 	var file = slide.file;
+	this.uploadedSlide = slide;
 	this.previewImg = slide.img;
 	this.progressBar = slide.progressBar;
 	var self = this;
@@ -66,14 +65,24 @@ DDFileUploader.prototype.upload = function(slide) {
 	addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
 	addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);});
 
-	req.open("PUT", this.uploadUrl + '/' + file.name);
+	req.open("PUT", this.uploadUrl);
 	req.setRequestHeader("Content-Type", file.type);
-	addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);});
+	req.setRequestHeader("X-File-Name", file.name);
+	addListener(reader, 'load',
+		function(evt){
+			console.info('load');
+			try {
+				req.sendAsBinary(evt.target.result);
+			}
+			catch(e){}
+		});
 	reader.readAsBinaryString(file);
 };
 
 DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
-	this.progressBar.parentNode.removeChild(this.progressBar);
+	var slide = this.uploadedSlide;
+	this.uploadedSlide.removeChild(slide.label);
+    this.uploadedSlide.removeChild(slide.progressBar);
 	this.uploadQueueLoadNext();
 };
 
@@ -90,8 +99,9 @@ DDFileUploader.prototype.progressHandler = function(evt) {
 
 DDFileUploader.prototype.previewQueuePush = function(slide) {
 	this.previewQueue.push(slide);
-	if (!this._previewQueueRunning)
+	if (!this._previewQueueRunning) {
 		this.startPreviewQueue();
+	}
 };
 
 DDFileUploader.prototype.startPreviewQueue = function() {
@@ -101,16 +111,19 @@ DDFileUploader.prototype.startPreviewQueue = function() {
 
 DDFileUploader.prototype.previewQueueLoadNext = function() {
 	var slide = this.previewQueue.shift();
-	if (slide)
+	if (slide) {
 		this.previewUploadedImage(slide);
-	else
+	}
+	else {
 		this._previewQueueRunning = false;
+	}
 };
 
 DDFileUploader.prototype.uploadQueuePush = function(slide) {
 	this.uploadQueue.push(slide);
-	if (!this._uploadQueueRunning)
+	if (!this._uploadQueueRunning) {
 		this.startUploadQueue();
+	}
 };
 
 DDFileUploader.prototype.startUploadQueue = function() {
@@ -121,10 +134,12 @@ DDFileUploader.prototype.startUploadQueue = function() {
 
 DDFileUploader.prototype.uploadQueueLoadNext = function() {
 	var slide = this.uploadQueue.shift();
-	if (slide)
+	if (slide) {
 		this.upload(slide);
-	else
+	}
+	else {
 		this._uploadQueueRunning = false;
+	}
 };
 
 
@@ -142,7 +157,6 @@ DDFileUploader.prototype.createSlide = function(file) {
 	var size = this.thumbnailSize;
 	var self = this;
 	img.onload = function(evt) {
-		console.info('createSlide loaded.')
 		if (img.width > img.height) { // landscape
 			img.height = Math.round(size * img.height / img.width);
 			img.width = size;
@@ -158,6 +172,11 @@ DDFileUploader.prototype.createSlide = function(file) {
 	};
 	a.appendChild(img);
 	slide.img = img;
+	
+	var label = document.createElement('span');
+	slide.label = label;
+	label.className = 'label';
+	label.innerHTML = file.name;
 
 	var progressBar = document.createElement('span');
 	progressBar.className = 'upload-progress';
@@ -165,7 +184,7 @@ DDFileUploader.prototype.createSlide = function(file) {
 
 	slide.appendChild(a);
 	slide.appendChild(progressBar);
-	// this.progressBar = progressBar;
+	slide.appendChild(label);
 	this.dropbox.appendChild(slide);
 	
 	return slide;
@@ -184,10 +203,8 @@ DDFileUploader.prototype.previewUploadedImage = function(slide) {
 	var self = this;
 	
 	reader.onload = function(evt) {
-		console.info('previewUploadedImage loaded.')
 		slide.img.src = evt.target.result;
-		setTimeout(function(){self.previewQueueLoadNext();}, 1000);
-		// self.previewQueueLoadNext();
+		setTimeout(function(){self.previewQueueLoadNext();}, 500);
 	};
 	reader.readAsDataURL(slide.file);
 };