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 a67b3cf..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);

        }
 };
 
        }
 };
 


@@ -57,22 +57,38 @@ 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;
        
        addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
        this.previewImg = slide.img;
        this.progressBar = slide.progressBar;
        var self = this;
        
        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);
+       // 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);

        req.setRequestHeader("Content-Type", file.type);
        req.setRequestHeader("X-File-Name", file.name);
        req.setRequestHeader("Content-Type", file.type);
        req.setRequestHeader("X-File-Name", file.name);

-       addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);});
+       addListener(reader, 'load',
+               function(evt){
+                       try {
+                               req.sendAsBinary(evt.target.result);
+                       }
+                       catch(e){}
+               });

        reader.readAsBinaryString(file);
 };
 
        reader.readAsBinaryString(file);
 };
 

-DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
-       this.progressBar.parentNode.removeChild(this.progressBar);
+DDFileUploader.prototype.uploadCompleteHandler = function(req) {
+       var slide = this.uploadedSlide;
+       this.uploadedSlide.removeChild(slide.label);
+    this.uploadedSlide.removeChild(slide.progressBar);
+       slide.innerHTML = req.responseXML.documentElement.firstChild.data;

        this.uploadQueueLoadNext();
 };
 
        this.uploadQueueLoadNext();
 };
 


@@ -162,6 +178,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';


@@ -169,6 +190,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;