From f9b11dd5e73b24997159b899b87e20fe70e44af3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Fri, 21 Jun 2013 10:55:33 +0200
Subject: [PATCH] =?utf8?q?Un=20peu=20de=20m=C3=A9nage,=20opacit=C3=A9=20pr?=
=?utf8?q?ogressive,=20lors=20de=20l'upload.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
skins/fileupload.js | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
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) {
--
2.20.1