Gestion de deux queues de chargement : en local, et en upload.

diff --git a/skins/fileupload.js b/skins/fileupload.js
index da5c08d..7229df9 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -9,6 +9,10 @@ DDFileUploader = function(dropbox, uploadUrl) {
        this.slideSize = 222;
        this.progressBarMaxSize = 200; // pixels
        this.thumbnailSize = 180;
        this.slideSize = 222;
        this.progressBarMaxSize = 200; // pixels
        this.thumbnailSize = 180;

+       this.previewQueue = [];
+       this._previewQueueRunning = false;
+       this.uploadQueue = [];
+       this._uploadQueueRunning = false;

        var self = this;
        addListener(dropbox, 'dragenter', function(evt){self.dragenter(evt);});
        addListener(dropbox, 'dragover', function(evt){self.dragover(evt);});
        var self = this;
        addListener(dropbox, 'dragenter', function(evt){self.dragenter(evt);});
        addListener(dropbox, 'dragover', function(evt){self.dragover(evt);});


@@ -40,18 +44,23 @@ DDFileUploader.prototype.drop = function(evt) {
 
 // Methods about upload
 DDFileUploader.prototype.handleFiles = function(files) {
 
 // Methods about upload
 DDFileUploader.prototype.handleFiles = function(files) {

-       var file, i;
+       var file, i, slide;

        for (i = 0; i < files.length; i++) {
                file = files[i];
        for (i = 0; i < files.length; i++) {
                file = files[i];

-               this.createSlide();
-               this.previewUploadedImage(file);
-               this.upload(file);
+               slide = this.createSlide(file);
+               this.previewQueuePush(slide);
+               this.uploadQueuePush(slide);
+               // this.previewUploadedImage(file);
+               // this.upload(file);

        }
 };
 
        }
 };
 

-DDFileUploader.prototype.upload = function(file) {
+DDFileUploader.prototype.upload = function(slide) {

        var reader = new FileReader();
        var req = new XMLHttpRequest();
        var reader = new FileReader();
        var req = new XMLHttpRequest();

+       var file = slide.file;
+       this.previewImg = slide.img;
+       this.progressBar = slide.progressBar;

        var self = this;
        
        addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
        var self = this;
        
        addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});


@@ -65,6 +74,7 @@ DDFileUploader.prototype.upload = function(file) {
 
 DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
        this.progressBar.parentNode.removeChild(this.progressBar);
 
 DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
        this.progressBar.parentNode.removeChild(this.progressBar);

+       this.uploadQueueLoadNext();

 };
 
 DDFileUploader.prototype.progressHandler = function(evt) {
 };
 
 DDFileUploader.prototype.progressHandler = function(evt) {


@@ -76,19 +86,63 @@ DDFileUploader.prototype.progressHandler = function(evt) {
        }
 };
 
        }
 };
 

+// Method about queues
+
+DDFileUploader.prototype.previewQueuePush = function(slide) {
+       this.previewQueue.push(slide);
+       if (!this._previewQueueRunning)
+               this.startPreviewQueue();
+};
+
+DDFileUploader.prototype.startPreviewQueue = function() {
+       this._previewQueueRunning = true;
+       this.previewQueueLoadNext();
+};
+
+DDFileUploader.prototype.previewQueueLoadNext = function() {
+       var slide = this.previewQueue.shift();
+       if (slide)
+               this.previewUploadedImage(slide);
+       else
+               this._previewQueueRunning = false;
+};
+
+DDFileUploader.prototype.uploadQueuePush = function(slide) {
+       this.uploadQueue.push(slide);
+       if (!this._uploadQueueRunning)
+               this.startUploadQueue();
+};
+
+DDFileUploader.prototype.startUploadQueue = function() {
+       this._uploadQueueRunning = true;
+       this.uploadQueueLoadNext();
+};
+
+
+DDFileUploader.prototype.uploadQueueLoadNext = function() {
+       var slide = this.uploadQueue.shift();
+       if (slide)
+               this.upload(slide);
+       else
+               this._uploadQueueRunning = false;
+};
+
+

 // User interface
 // User interface

-DDFileUploader.prototype.createSlide = function() {
+DDFileUploader.prototype.createSlide = function(file) {

        var slide = document.createElement('span');
        var slide = document.createElement('span');

+       slide.file = file;

 
        var a = document.createElement('a');
        a.href = '#';
        a.className = 'slide';
 
        var img = document.createElement('img');
 
        var a = document.createElement('a');
        a.href = '#';
        a.className = 'slide';
 
        var img = document.createElement('img');

-       this.previewImg = img;
+       img.className = 'hidden';

        var size = this.thumbnailSize;
        var self = this;
        img.onload = function(evt) {
        var size = this.thumbnailSize;
        var self = this;
        img.onload = function(evt) {

+               console.info('createSlide loaded.')

                if (img.width > img.height) { // landscape
                        img.height = Math.round(size * img.height / img.width);
                        img.width = size;
                if (img.width > img.height) { // landscape
                        img.height = Math.round(size * img.height / img.width);
                        img.width = size;


@@ -103,14 +157,18 @@ DDFileUploader.prototype.createSlide = function() {
                img.className = undefined;
        };
        a.appendChild(img);
                img.className = undefined;
        };
        a.appendChild(img);

+       slide.img = img;

 
        var progressBar = document.createElement('span');
        progressBar.className = 'upload-progress';
 
        var progressBar = document.createElement('span');
        progressBar.className = 'upload-progress';

+       slide.progressBar = progressBar;

 
        slide.appendChild(a);
        slide.appendChild(progressBar);
 
        slide.appendChild(a);
        slide.appendChild(progressBar);

-       this.progressBar = progressBar;
+       // this.progressBar = progressBar;

        this.dropbox.appendChild(slide);
        this.dropbox.appendChild(slide);

+       
+       return slide;

 };
 
 DDFileUploader.prototype.updateProgressBar = function(progress) {
 };
 
 DDFileUploader.prototype.updateProgressBar = function(progress) {


@@ -120,17 +178,18 @@ DDFileUploader.prototype.updateProgressBar = function(progress) {
        this.progressBar.style.width = size + 'px';
 };
 
        this.progressBar.style.width = size + 'px';
 };
 

-DDFileUploader.prototype.previewUploadedImage = function(file) {
+DDFileUploader.prototype.previewUploadedImage = function(slide) {

        var reader = new FileReader();
        var reader = new FileReader();

-       var img = this.previewImg;

        var size = this.thumbnailSize;
        var size = this.thumbnailSize;

-       
-       img.className = 'hidden';
+       var self = this;

        
        reader.onload = function(evt) {
        
        reader.onload = function(evt) {

-               img.src = evt.target.result;
+               console.info('previewUploadedImage loaded.')
+               slide.img.src = evt.target.result;
+               setTimeout(function(){self.previewQueueLoadNext();}, 1000);
+               // self.previewQueueLoadNext();

        };
        };

-       reader.readAsDataURL(file);
+       reader.readAsDataURL(slide.file);

 };
 
 }());
 };
 
 }());