Ré-introduction des images en preview local. Limitation du nombre d'images locales...

[Plinn.git] / skins / fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index efef40b..65a2984 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -2,6 +2,8 @@
 var DDFileUploader;
 
 (function(){
 var DDFileUploader;
 
 (function(){

+// nombre maximun d'image chargées en local
+var MAX_PREVIEW = 5;

 
 DDFileUploader = function(dropbox, uploadUrl) {
        this.dropbox = dropbox;
 
 DDFileUploader = function(dropbox, uploadUrl) {
        this.dropbox = dropbox;


@@ -11,6 +13,7 @@ DDFileUploader = function(dropbox, uploadUrl) {
        this.thumbnailSize = 180;
        this.previewQueue = [];
        this._previewQueueRunning = false;
        this.thumbnailSize = 180;
        this.previewQueue = [];
        this._previewQueueRunning = false;

+       this.previewsLoaded = 0;

        this.uploadQueue = [];
        this._uploadQueueRunning = false;
        var self = this;
        this.uploadQueue = [];
        this._uploadQueueRunning = false;
        var self = this;


@@ -48,7 +51,7 @@ 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.previewQueuePush(slide);

         this.uploadQueuePush(slide);
        }
 };
         this.uploadQueuePush(slide);
        }
 };


@@ -63,7 +66,12 @@ 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, 'readystatechange',
+               function(evt) {
+                       if (req.readyState === 4) {
+                               self.uploadCompleteHandler(req);
+                       }
+               });

 
        req.open("PUT", this.uploadUrl);
        req.setRequestHeader("Content-Type", file.type);
 
        req.open("PUT", this.uploadUrl);
        req.setRequestHeader("Content-Type", file.type);


@@ -78,14 +86,14 @@ 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);
     this.uploadedSlide.removeChild(slide.progressBar);
        var slide = this.uploadedSlide;
        this.uploadedSlide.removeChild(slide.label);
     this.uploadedSlide.removeChild(slide.progressBar);

+       slide.innerHTML = req.responseXML.documentElement.firstChild.data;
+       this.previewsLoaded--;
+       this.previewQueueLoadNext();

        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) {


@@ -112,11 +120,14 @@ DDFileUploader.prototype.startPreviewQueue = function() {
 };
 
 DDFileUploader.prototype.previewQueueLoadNext = function() {
 };
 
 DDFileUploader.prototype.previewQueueLoadNext = function() {

-       var slide = this.previewQueue.shift();
-       if (slide) {
+       if (this.previewQueue.length && this.previewsLoaded < MAX_PREVIEW) {
+               var slide = this.previewQueue.shift();
+               console.info('previewQueueLoadNext', this.previewsLoaded, slide.file.name);

                this.previewUploadedImage(slide);
                this.previewUploadedImage(slide);

+               this.previewsLoaded++;

        }
        else {
        }
        else {

+               console.warn('previewQueueLoadNext skipped', this.previewsLoaded);

                this._previewQueueRunning = false;
        }
 };
                this._previewQueueRunning = false;
        }
 };