Renommage variable dans méthodes de manipulation de la file d'envoi.

[Portfolio.git] / skins / fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index c202bfe..5a69929 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -1,19 +1,11 @@
 // © 2013 Benoît Pin MINES ParisTech
 // © 2013 Benoît Pin MINES ParisTech

-var DDFileUploader;
+var DDFileUploaderBase;

 
 (function(){
 
 (function(){

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

 
 

-DDFileUploader = function(dropbox, uploadUrl) {
+DDFileUploaderBase = function(dropbox, uploadUrl) {

        this.dropbox = dropbox;
        this.uploadUrl = uploadUrl;
        this.dropbox = dropbox;
        this.uploadUrl = uploadUrl;

-       this.slideSize = 222;
-       this.progressBarMaxSize = 200; // pixels
-       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;


@@ -23,12 +15,12 @@ DDFileUploader = function(dropbox, uploadUrl) {
 };
 
 // Drag and drop
 };
 
 // Drag and drop

-DDFileUploader.prototype.dragenter = function(evt) {
+DDFileUploaderBase.prototype.dragenter = function(evt) {

        disableDefault(evt);
        disablePropagation(evt);
 };
 
        disableDefault(evt);
        disablePropagation(evt);
 };
 

-DDFileUploader.prototype.dragover = function(evt) {
+DDFileUploaderBase.prototype.dragover = function(evt) {

        disableDefault(evt);
        disablePropagation(evt);
        evt = getEventObject(evt);
        disableDefault(evt);
        disablePropagation(evt);
        evt = getEventObject(evt);


@@ -36,7 +28,7 @@ DDFileUploader.prototype.dragover = function(evt) {
        dt.dropEffect = 'copy';
 };
 
        dt.dropEffect = 'copy';
 };
 

-DDFileUploader.prototype.drop = function(evt) {
+DDFileUploaderBase.prototype.drop = function(evt) {

        disableDefault(evt);
        disablePropagation(evt);
        getEventObject(evt);
        disableDefault(evt);
        disablePropagation(evt);
        getEventObject(evt);


@@ -46,17 +38,11 @@ DDFileUploader.prototype.drop = function(evt) {
 };
 
 // Methods about upload
 };
 
 // Methods about upload

-DDFileUploader.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);
-       }
+DDFileUploaderBase.prototype.handleFiles = function(files) {
+       // To be implemented by descendant.

 };
 
 };
 

-DDFileUploader.prototype.upload = function(slide) {
+DDFileUploaderBase.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;


@@ -86,25 +72,39 @@ DDFileUploader.prototype.upload = function(slide) {
        reader.readAsBinaryString(file);
 };
 
        reader.readAsBinaryString(file);
 };
 

-DDFileUploader.prototype.uploadCompleteHandler = function(req) {
+DDFileUploaderBase.prototype.uploadCompleteHandler = function(req) {

        var slide = this.uploadedSlide;
        this.uploadedSlide.removeChild(slide.label);
     this.uploadedSlide.removeChild(slide.progressBar);
        var fragment = getCopyOfNode(req.responseXML.documentElement.firstChild);
        var img = fragment.getElementsByTagName('img')[0];
        var slide = this.uploadedSlide;
        this.uploadedSlide.removeChild(slide.label);
     this.uploadedSlide.removeChild(slide.progressBar);
        var fragment = getCopyOfNode(req.responseXML.documentElement.firstChild);
        var img = fragment.getElementsByTagName('img')[0];

-       img.onload = function(evt) {
-               // accelerate GC before replacing
+       if (req.status === 200) {
+               // update
+               var existing = this.existingSlides[img.src];
+               if (existing) {
+                       existing.src = existing.src + '?' + Math.random().toString();
+               }

                slide.img.src = '';
                slide.img.parentNode.removeChild(slide.img);
                slide.img = undefined;
                slide.img.src = '';
                slide.img.parentNode.removeChild(slide.img);
                slide.img = undefined;

-               slide.parentNode.replaceChild(fragment, slide);
-       };
+               slide.parentNode.removeChild(slide);
+       }
+       else if(req.status === 201) {
+               // creation
+               img.onload = function(evt) {
+                       // accelerate GC before replacing
+                       slide.img.src = '';
+                       slide.img.parentNode.removeChild(slide.img);
+                       slide.img = undefined;
+                       slide.parentNode.replaceChild(fragment, slide);
+               };
+       }

        this.previewsLoaded--;
        this.previewQueueLoadNext();
        this.uploadQueueLoadNext();
 };
 
        this.previewsLoaded--;
        this.previewQueueLoadNext();
        this.uploadQueueLoadNext();
 };
 

-DDFileUploader.prototype.progressHandler = function(evt) {
+DDFileUploaderBase.prototype.progressHandler = function(evt) {

        if (evt.lengthComputable) {
                var progress = evt.loaded / evt.total;
                this.updateProgressBar(progress);
        if (evt.lengthComputable) {
                var progress = evt.loaded / evt.total;
                this.updateProgressBar(progress);


@@ -113,119 +113,27 @@ 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() {
-       if (this.previewQueue.length && this.previewsLoaded < MAX_PREVIEW) {
-               var slide = this.previewQueue.shift();
-               this.previewUploadedImage(slide);
-               this.previewsLoaded++;
-       }
-       else {
-               this._previewQueueRunning = false;
-       }
-};
-
-DDFileUploader.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();
        }
 };
 

-DDFileUploader.prototype.startUploadQueue = function() {
+DDFileUploaderBase.prototype.startUploadQueue = function() {

        this._uploadQueueRunning = true;
        this.uploadQueueLoadNext();
 };
 
        this._uploadQueueRunning = true;
        this.uploadQueueLoadNext();
 };
 

-
-DDFileUploader.prototype.uploadQueueLoadNext = function() {
-       var slide = this.uploadQueue.shift();
-       if (slide) {
-               this.upload(slide);
+DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
+       var item = this.uploadQueue.shift();
+       if (item) {
+               this.upload(item);

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

-
-// User interface
-DDFileUploader.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;
-};
-
-DDFileUploader.prototype.updateProgressBar = function(progress) {
-       // 0 <= progress <= 1
-       var size = this.progressBarMaxSize * progress;
-       size = Math.round(size);
-       this.progressBar.style.width = size + 'px';
-};
-
-DDFileUploader.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);
-};
-

 }());
 }());