Introduction du callback « progressHandlerCB ».

[Plinn.git] / skins / fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 497e30a..318f059 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -2,8 +2,6 @@
 var DDFileUploaderBase;
 
 (function(){
 var DDFileUploaderBase;
 
 (function(){

-// nombre maximun d'image chargées en local
-var MAX_PREVIEW = 2;

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


@@ -41,22 +39,23 @@ DDFileUploaderBase.prototype.drop = function(evt) {
 
 // Methods about upload
 DDFileUploaderBase.prototype.handleFiles = function(files) {
 
 // Methods about upload
 DDFileUploaderBase.prototype.handleFiles = function(files) {

-       var file, i, slide;
-       for (i = 0; i < files.length; i++) {
-               file = files[i];
-               slide = this.createSlide(file);
-        this.previewQueuePush(slide);
-        this.uploadQueuePush(slide);
-       }
+       // To be implemented by descendant.
+};
+
+
+
+DDFileUploaderBase.prototype.beforeUpload = function(item) {
+       // To be implemented by decendant.

 };
 
 };
 

-DDFileUploaderBase.prototype.upload = function(slide) {
+
+DDFileUploaderBase.prototype.upload = function(item) {
+       // item.file must be the file to be uploaded
+       this.beforeUpload(item);

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

-       var file = slide.file;
-       this.uploadedSlide = slide;
-       this.previewImg = slide.img;
-       this.progressBar = slide.progressBar;
+       var file = item.file;
+       

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


@@ -112,42 +111,21 @@ DDFileUploaderBase.prototype.uploadCompleteHandler = function(req) {
        this.uploadQueueLoadNext();
 };
 
        this.uploadQueueLoadNext();
 };
 

+DDFileUploaderBase.prototype.progressHandlerCB = function(progress) {
+       // To be implemented by descendant.
+       // 0 <= progress <= 1
+};
+

 DDFileUploaderBase.prototype.progressHandler = function(evt) {
        if (evt.lengthComputable) {
                var progress = evt.loaded / evt.total;
 DDFileUploaderBase.prototype.progressHandler = function(evt) {
        if (evt.lengthComputable) {
                var progress = evt.loaded / evt.total;

-               this.updateProgressBar(progress);
-               var currentOpacity = this.previewImg.style.opacity;
-               this.previewImg.style.opacity = Math.max(currentOpacity, progress);
+               this.progressHandlerCB(progress);

        }
 };
 
        }
 };
 

-// Method about queues
-
-DDFileUploaderBase.prototype.previewQueuePush = function(slide) {
-       this.previewQueue.push(slide);
-       if (!this._previewQueueRunning) {
-               this.startPreviewQueue();
-       }
-};
-
-DDFileUploaderBase.prototype.startPreviewQueue = function() {
-       this._previewQueueRunning = true;
-       this.previewQueueLoadNext();
-};
-
-DDFileUploaderBase.prototype.previewQueueLoadNext = function() {
-       if (this.previewQueue.length && this.previewsLoaded < MAX_PREVIEW) {
-               var slide = this.previewQueue.shift();
-               this.previewUploadedImage(slide);
-               this.previewsLoaded++;
-       }
-       else {
-               this._previewQueueRunning = false;
-       }
-};
-
-DDFileUploaderBase.prototype.uploadQueuePush = function(slide) {
-       this.uploadQueue.push(slide);
+// Methods about queue
+DDFileUploaderBase.prototype.uploadQueuePush = function(item) {
+       this.uploadQueue.push(item);

        if (!this._uploadQueueRunning) {
                this.startUploadQueue();
        }
        if (!this._uploadQueueRunning) {
                this.startUploadQueue();
        }


@@ -158,82 +136,14 @@ DDFileUploaderBase.prototype.startUploadQueue = function() {
        this.uploadQueueLoadNext();
 };
 
        this.uploadQueueLoadNext();
 };
 

-

 DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
 DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {

-       var slide = this.uploadQueue.shift();
-       if (slide) {
-               this.upload(slide);
+       var item = this.uploadQueue.shift();
+       if (item) {
+               this.upload(item);

        }
        else {
                this._uploadQueueRunning = false;
        }
 };
 
        }
        else {
                this._uploadQueueRunning = false;
        }
 };
 

-
-// User interface
-DDFileUploaderBase.prototype.createSlide = function(file) {
-       var slide = document.createElement('span');
-       slide.file = file;
-
-       var a = document.createElement('a');
-       a.href = '#';
-       a.className = 'slide';
-
-       var img = document.createElement('img');
-       img.className = 'hidden';
-       var size = this.thumbnailSize;
-       var self = this;
-       img.onload = function(evt) {
-               if (img.width > img.height) { // landscape
-                       img.height = Math.round(size * img.height / img.width);
-                       img.width = size;
-               }
-               else {
-                       img.width = Math.round(size * img.width / img.height);
-                       img.height = size;
-               }
-               img.style.marginLeft = Math.floor((self.slideSize - img.width) / 2) + 'px';
-               img.style.marginTop = Math.floor((self.slideSize - img.height) / 2) + 'px';
-               img.style.opacity = 0.2;
-               img.className = undefined;
-       };
-       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';
-       slide.progressBar = progressBar;
-
-       slide.appendChild(a);
-       slide.appendChild(progressBar);
-       slide.appendChild(label);
-       this.dropbox.appendChild(slide);
-       
-       return slide;
-};
-
-DDFileUploaderBase.prototype.updateProgressBar = function(progress) {
-       // 0 <= progress <= 1
-       var size = this.progressBarMaxSize * progress;
-       size = Math.round(size);
-       this.progressBar.style.width = size + 'px';
-};
-
-DDFileUploaderBase.prototype.previewUploadedImage = function(slide) {
-       var reader = new FileReader();
-       var size = this.thumbnailSize;
-       var self = this;
-       
-       reader.onload = function(evt) {
-               slide.img.src = evt.target.result;
-               setTimeout(function(){self.previewQueueLoadNext();}, 500);
-       };
-       reader.readAsDataURL(slide.file);
-};
-

 }());
 }());