optimisation empreinte mémoire.

[Portfolio.git] / skins / fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 7229df9..c202bfe 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -2,6 +2,8 @@
 var DDFileUploader;
 
 (function(){
+// nombre maximun d'image chargées en local
+var MAX_PREVIEW = 2;
 
 DDFileUploader = function(dropbox, uploadUrl) {
        this.dropbox = dropbox;
@@ -11,6 +13,7 @@ DDFileUploader = function(dropbox, uploadUrl) {
        this.thumbnailSize = 180;
        this.previewQueue = [];
        this._previewQueueRunning = false;
+       this.previewsLoaded = 0;
        this.uploadQueue = [];
        this._uploadQueueRunning = false;
        var self = this;
@@ -48,10 +51,8 @@ DDFileUploader.prototype.handleFiles = function(files) {
        for (i = 0; i < files.length; i++) {
                file = files[i];
                slide = this.createSlide(file);
-               this.previewQueuePush(slide);
-               this.uploadQueuePush(slide);
-               // this.previewUploadedImage(file);
-               // this.upload(file);
+        this.previewQueuePush(slide);
+        this.uploadQueuePush(slide);
        }
 };
 
@@ -59,21 +60,47 @@ DDFileUploader.prototype.upload = function(slide) {
        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);});
-       addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);});
-
-       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);
-       addListener(reader, 'load', 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);
 };
 
-DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
-       this.progressBar.parentNode.removeChild(this.progressBar);
+DDFileUploader.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];
+       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();
 };
 
@@ -90,8 +117,9 @@ DDFileUploader.prototype.progressHandler = function(evt) {
 
 DDFileUploader.prototype.previewQueuePush = function(slide) {
        this.previewQueue.push(slide);
-       if (!this._previewQueueRunning)
+       if (!this._previewQueueRunning) {
                this.startPreviewQueue();
+       }
 };
 
 DDFileUploader.prototype.startPreviewQueue = function() {
@@ -100,17 +128,21 @@ DDFileUploader.prototype.startPreviewQueue = 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();
                this.previewUploadedImage(slide);
-       else
+               this.previewsLoaded++;
+       }
+       else {
                this._previewQueueRunning = false;
+       }
 };
 
 DDFileUploader.prototype.uploadQueuePush = function(slide) {
        this.uploadQueue.push(slide);
-       if (!this._uploadQueueRunning)
+       if (!this._uploadQueueRunning) {
                this.startUploadQueue();
+       }
 };
 
 DDFileUploader.prototype.startUploadQueue = function() {
@@ -121,10 +153,12 @@ DDFileUploader.prototype.startUploadQueue = function() {
 
 DDFileUploader.prototype.uploadQueueLoadNext = function() {
        var slide = this.uploadQueue.shift();
-       if (slide)
+       if (slide) {
                this.upload(slide);
-       else
+       }
+       else {
                this._uploadQueueRunning = false;
+       }
 };
 
 
@@ -142,7 +176,6 @@ DDFileUploader.prototype.createSlide = function(file) {
        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;
@@ -151,13 +184,18 @@ DDFileUploader.prototype.createSlide = function(file) {
                        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.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';
@@ -165,7 +203,7 @@ DDFileUploader.prototype.createSlide = function(file) {
 
        slide.appendChild(a);
        slide.appendChild(progressBar);
-       // this.progressBar = progressBar;
+       slide.appendChild(label);
        this.dropbox.appendChild(slide);
        
        return slide;
@@ -184,10 +222,8 @@ DDFileUploader.prototype.previewUploadedImage = function(slide) {
        var self = this;
        
        reader.onload = function(evt) {
-               console.info('previewUploadedImage loaded.')
                slide.img.src = evt.target.result;
-               setTimeout(function(){self.previewQueueLoadNext();}, 1000);
-               // self.previewQueueLoadNext();
+               setTimeout(function(){self.previewQueueLoadNext();}, 500);
        };
        reader.readAsDataURL(slide.file);
 };