From 6f71934230126c5d64b3e8fbcf28e14dc8fab812 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Fri, 26 Jul 2013 17:41:17 +0200
Subject: [PATCH] =?utf8?q?Gestion=20affichage=20lors=20de=20l'=C3=A9crasem?=
=?utf8?q?ent.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
skins/fileupload.js | 36 ++++++++++++++++++++++++++++++++----
1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/skins/fileupload.js b/skins/fileupload.js
index c202bfe..3f5f8c5 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -4,9 +4,11 @@ var DDFileUploader;
(function(){
// nombre maximun d'image chargées en local
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);
@@ -92,13 +106,27 @@ DDFileUploader.prototype.uploadCompleteHandler = function(req) {
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.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();
--
2.20.1