X-Git-Url: https://scm.cri.mines-paristech.fr/git/Portfolio.git/blobdiff_plain/4dee479f3957299afc14e57962d4f4d9aa0633aa..e25cce0c923cea149eb953855dc782d10a3bcaba:/skins/fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 75c6c6f..6ee52d5 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -89,7 +89,7 @@ DDFileUploader.prototype.updateProgressBar = function(progress) {
 	var size = this.progressBarMaxSize * progress;
 	size = Math.round(size);
 	this.progressBar.style.width = size + 'px';
-}
+};
 
 
 DDFileUploader.prototype.upload = function(file) {
@@ -100,17 +100,9 @@ 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.readAsBinaryString(file);
 };
 
@@ -119,8 +111,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) {