From: Benoît Pin <pin@cri.ensmp.fr>
Date: Fri, 21 Jun 2013 08:55:33 +0000 (+0200)
Subject: Un peu de ménage, opacité progressive, lors de l'upload.
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Portfolio.git/commitdiff_plain/f9b11dd5e73b24997159b899b87e20fe70e44af3

Un peu de ménage, opacité progressive, lors de l'upload.
---

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 75c6c6f..42616a9 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -100,17 +100,12 @@ DDFileUploader.prototype.upload = function(file) {
 	addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
 	addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);});
 
-	// req.upload.addEventListener("load", function(e){
-	//   self.ctrl.update(100);
-	//   var canvas = self.ctrl.ctx.canvas;
-	//   canvas.parentNode.removeChild(canvas);
-	//  }, false);
 	req.open("PUT", this.uploadUrl + '/' + file.name);
 	req.setRequestHeader("Content-Type", file.type);
-	// req.overrideMimeType('text/plain; charset=x-user-defined-binary');
-	reader.onload = function(evt) {
-		req.sendAsBinary(evt.target.result);
-	};
+	addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);})
+	// reader.onload = function(evt) {
+	// 	req.sendAsBinary(evt.target.result);
+	// };
 	reader.readAsBinaryString(file);
 };
 
@@ -119,8 +114,11 @@ DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
 };
 
 DDFileUploader.prototype.progressHandler = function(evt) {
-	if (evt.lengthComputable)
-		this.updateProgressBar(evt.loaded / evt.total);
+	if (evt.lengthComputable) {
+		var progress = evt.loaded / evt.total;
+		this.updateProgressBar(progress);
+		this.previewImg.style.opacity=progress;
+	}
 };
 
 DDFileUploader.prototype.previewUploadedImage = function(file) {