projects
/
Portfolio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Il faut écouter l'événement « readystatechange » plutôt que « load » pour récupérer...
[Portfolio.git]
/
skins
/
fileupload.js
diff --git
a/skins/fileupload.js
b/skins/fileupload.js
index
8e09907
..
04fde67
100644
(file)
--- a/
skins/fileupload.js
+++ b/
skins/fileupload.js
@@
-48,8
+48,8
@@
DDFileUploader.prototype.handleFiles = function(files) {
for (i = 0; i < files.length; i++) {
file = files[i];
slide = this.createSlide(file);
for (i = 0; i < files.length; i++) {
file = files[i];
slide = this.createSlide(file);
-
this.previewQueuePush(slide);
-
this.uploadQueuePush(slide);
+
//
this.previewQueuePush(slide);
+ this.uploadQueuePush(slide);
}
};
}
};
@@
-63,13
+63,19
@@
DDFileUploader.prototype.upload = function(slide) {
var self = this;
addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
var self = this;
addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
- addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);});
+ // addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt, req);});
+ addListener(req, 'readystatechange',
+ function(evt) {
+ if (req.readyState == 4) {
+ self.uploadCompleteHandler(req);
+ }
+ });
- req.open("PUT", this.uploadUrl
+ '/' + file.name
);
+ req.open("PUT", this.uploadUrl);
req.setRequestHeader("Content-Type", file.type);
req.setRequestHeader("Content-Type", file.type);
+ req.setRequestHeader("X-File-Name", file.name);
addListener(reader, 'load',
function(evt){
addListener(reader, 'load',
function(evt){
- console.info('load');
try {
req.sendAsBinary(evt.target.result);
}
try {
req.sendAsBinary(evt.target.result);
}
@@
-78,10
+84,11
@@
DDFileUploader.prototype.upload = function(slide) {
reader.readAsBinaryString(file);
};
reader.readAsBinaryString(file);
};
-DDFileUploader.prototype.uploadCompleteHandler = function(
evt
) {
+DDFileUploader.prototype.uploadCompleteHandler = function(
req
) {
var slide = this.uploadedSlide;
this.uploadedSlide.removeChild(slide.label);
var slide = this.uploadedSlide;
this.uploadedSlide.removeChild(slide.label);
- this.uploadedSlide.removeChild(slide.label);
+ this.uploadedSlide.removeChild(slide.progressBar);
+ slide.innerHTML = req.responseXML.documentElement.firstChild.data;
this.uploadQueueLoadNext();
};
this.uploadQueueLoadNext();
};