projects
/
Plinn.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
75a2156
)
Un peu de ménage, opacité progressive, lors de l'upload.
author
Benoît Pin
<pin@cri.ensmp.fr>
Fri, 21 Jun 2013 08:55:33 +0000
(10:55 +0200)
committer
Benoît Pin
<pin@cri.ensmp.fr>
Wed, 14 Aug 2013 10:33:10 +0000
(12:33 +0200)
skins/fileupload.js
patch
|
blob
|
history
diff --git
a/skins/fileupload.js
b/skins/fileupload.js
index
75c6c6f
..
42616a9
100644
(file)
--- 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);});
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.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);
};
reader.readAsBinaryString(file);
};
@@
-119,8
+114,11
@@
DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
};
DDFileUploader.prototype.progressHandler = 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) {
};
DDFileUploader.prototype.previewUploadedImage = function(file) {