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 75c6c6f..5a69929 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -1,26 +1,26 @@
 // © 2013 Benoît Pin MINES ParisTech
 // © 2013 Benoît Pin MINES ParisTech

-var DDFileUploader;
+var DDFileUploaderBase;

 
 (function(){
 
 
 (function(){
 

-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.uploadQueue = [];
+       this._uploadQueueRunning = false;

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

-DDFileUploader.prototype.dragenter = function(evt) {
+// Drag and drop
+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);


@@ -28,8 +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);


@@ -38,102 +37,103 @@ DDFileUploader.prototype.drop = function(evt) {
        this.handleFiles(dt.files);
 };
 
        this.handleFiles(dt.files);
 };
 

-DDFileUploader.prototype.handleFiles = function(files) {
-       var file, i;
-       for (i = 0; i < files.length; i++) {
-               file = files[i];
-               this.createSlide();
-               this.previewUploadedImage(file);
-               this.upload(file);
-       }
+// Methods about upload
+DDFileUploaderBase.prototype.handleFiles = function(files) {
+       // To be implemented by descendant.

 };
 
 };
 

-
-DDFileUploader.prototype.createSlide = function() {
-       var slide = document.createElement('span');
-
-       var a = document.createElement('a');
-       a.href = '#';
-       a.className = 'slide';
-
-       var img = document.createElement('img');
-       this.previewImg = img;
-       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.round((self.slideSize - img.width) / 2) + 'px';
-               img.style.marginTop = Math.round((self.slideSize - img.height) / 2) + 'px';
-               img.className = undefined;
-       };
-       a.appendChild(img);
-
-       var progressBar = document.createElement('span');
-       progressBar.className = 'upload-progress';
-
-       slide.appendChild(a);
-       slide.appendChild(progressBar);
-       this.progressBar = progressBar;
-       this.dropbox.appendChild(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.upload = function(file) {
+DDFileUploaderBase.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.uploadedSlide = slide;
+       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);});

-       addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);});
-
-       // req.upload.addEventListener("load", function(e){
-       //   self.ctrl.update(100);
-       //   var canvas = self.ctrl.ctx.canvas;
-       //   canvas.parentNode.removeChild(canvas);
-       //  }, false);
-       req.open("PUT", this.uploadUrl + '/' + file.name);
+       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("Content-Type", file.type);

-       // req.overrideMimeType('text/plain; charset=x-user-defined-binary');
-       reader.onload = function(evt) {
-               req.sendAsBinary(evt.target.result);
-       };
+       req.setRequestHeader("X-File-Name", file.name);
+       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);
+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];
+       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.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();

 };
 
 };
 

-DDFileUploader.prototype.progressHandler = function(evt) {
-       if (evt.lengthComputable)
-               this.updateProgressBar(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);
+       }

 };
 
 };
 

-DDFileUploader.prototype.previewUploadedImage = function(file) {
-       var reader = new FileReader();
-       var img = this.previewImg;
-       var size = this.thumbnailSize;
-       
-       img.className = 'hidden';
-       
-       reader.onload = function(evt) {
-               img.src = evt.target.result;
-       };
-       reader.readAsDataURL(file);
+// Methods about queue
+DDFileUploaderBase.prototype.uploadQueuePush = function(item) {
+       this.uploadQueue.push(item);
+       if (!this._uploadQueueRunning) {
+               this.startUploadQueue();
+       }
+};
+
+DDFileUploaderBase.prototype.startUploadQueue = function() {
+       this._uploadQueueRunning = true;
+       this.uploadQueueLoadNext();
+};
+
+DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
+       var item = this.uploadQueue.shift();
+       if (item) {
+               this.upload(item);
+       }
+       else {
+               this._uploadQueueRunning = false;
+       }

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