projects
/
Portfolio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialisation du Content-Type à text/xml.
[Portfolio.git]
/
skins
/
fileupload.js
diff --git
a/skins/fileupload.js
b/skins/fileupload.js
index
980fb44
..
efef40b
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);
}
};
}
};
@@
-57,6
+57,7
@@
DDFileUploader.prototype.upload = function(slide) {
var reader = new FileReader();
var req = new XMLHttpRequest();
var file = slide.file;
var reader = new FileReader();
var req = new XMLHttpRequest();
var file = slide.file;
+ this.uploadedSlide = slide;
this.previewImg = slide.img;
this.progressBar = slide.progressBar;
var self = this;
this.previewImg = slide.img;
this.progressBar = slide.progressBar;
var self = this;
@@
-64,15
+65,27
@@
DDFileUploader.prototype.upload = function(slide) {
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.open("PUT", this.uploadUrl
+ '/' + file.name
);
+ req.open("PUT", this.uploadUrl);
req.setRequestHeader("Content-Type", file.type);
req.setRequestHeader("Content-Type", file.type);
- addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);});
+ req.setRequestHeader("X-File-Name", file.name);
+ addListener(reader, 'load',
+ function(evt){
+ try {
+ req.sendAsBinary(evt.target.result);
+ }
+ catch(e){}
+ });
reader.readAsBinaryString(file);
};
DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
reader.readAsBinaryString(file);
};
DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
- this.progressBar.parentNode.removeChild(this.progressBar);
+ var slide = this.uploadedSlide;
+ this.uploadedSlide.removeChild(slide.label);
+ this.uploadedSlide.removeChild(slide.progressBar);
this.uploadQueueLoadNext();
this.uploadQueueLoadNext();
+ var req = getTargetedObject(evt);
+ console.log(req);
+ // this.slide.innerHTML = req.responseXML.documentElement
};
DDFileUploader.prototype.progressHandler = function(evt) {
};
DDFileUploader.prototype.progressHandler = function(evt) {
@@
-161,6
+174,11
@@
DDFileUploader.prototype.createSlide = function(file) {
};
a.appendChild(img);
slide.img = img;
};
a.appendChild(img);
slide.img = img;
+
+ var label = document.createElement('span');
+ slide.label = label;
+ label.className = 'label';
+ label.innerHTML = file.name;
var progressBar = document.createElement('span');
progressBar.className = 'upload-progress';
var progressBar = document.createElement('span');
progressBar.className = 'upload-progress';
@@
-168,6
+186,7
@@
DDFileUploader.prototype.createSlide = function(file) {
slide.appendChild(a);
slide.appendChild(progressBar);
slide.appendChild(a);
slide.appendChild(progressBar);
+ slide.appendChild(label);
this.dropbox.appendChild(slide);
return slide;
this.dropbox.appendChild(slide);
return slide;