Gestion affichage lors de l'écrasement.

[Portfolio.git] / skins / fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 65a2984..3f5f8c5 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -3,10 +3,12 @@ var DDFileUploader;
 
 (function(){
 // nombre maximun d'image chargées en local
-var MAX_PREVIEW = 5;
+var MAX_PREVIEW = 2;
+var isThumbnail = /.*\/getThumbnail$/;
 
 DDFileUploader = function(dropbox, uploadUrl) {
        this.dropbox = dropbox;
+       this.existingSlides = this.indexExistingSlides();
        this.uploadUrl = uploadUrl;
        this.slideSize = 222;
        this.progressBarMaxSize = 200; // pixels
@@ -22,6 +24,18 @@ DDFileUploader = function(dropbox, uploadUrl) {
        addListener(dropbox, 'drop', function(evt){self.drop(evt);});
 };
 
+DDFileUploader.prototype.indexExistingSlides = function() {
+       var images = this.dropbox.getElementsByTagName('img');
+       var i;
+       var index = [];
+       for (i=0 ; i < images.length ; i++) {
+               if (isThumbnail.test(images[i].src)) {
+                       index[images[i].src] = images[i];
+               }
+       }
+       return index;
+};
+
 // Drag and drop
 DDFileUploader.prototype.dragenter = function(evt) {
        disableDefault(evt);
@@ -90,7 +104,29 @@ DDFileUploader.prototype.uploadCompleteHandler = function(req) {
        var slide = this.uploadedSlide;
        this.uploadedSlide.removeChild(slide.label);
     this.uploadedSlide.removeChild(slide.progressBar);
-       slide.innerHTML = req.responseXML.documentElement.firstChild.data;
+       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();
@@ -122,12 +158,10 @@ DDFileUploader.prototype.startPreviewQueue = function() {
 DDFileUploader.prototype.previewQueueLoadNext = function() {
        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.previewsLoaded++;
        }
        else {
-               console.warn('previewQueueLoadNext skipped', this.previewsLoaded);
                this._previewQueueRunning = false;
        }
 };
@@ -178,8 +212,8 @@ 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;
        };