projects
/
Portfolio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5cfa4a0
)
Gestion affichage lors de l'écrasement.
zope-2.13-prod
author
Benoît Pin
<pin@cri.ensmp.fr>
Fri, 26 Jul 2013 15:41:17 +0000
(17:41 +0200)
committer
Benoît Pin
<pin@cri.ensmp.fr>
Fri, 26 Jul 2013 15:41:17 +0000
(17:41 +0200)
skins/fileupload.js
patch
|
blob
|
history
diff --git
a/skins/fileupload.js
b/skins/fileupload.js
index
c202bfe
..
3f5f8c5
100644
(file)
--- 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;
(function(){
// nombre maximun d'image chargées en local
var MAX_PREVIEW = 2;
+var isThumbnail = /.*\/getThumbnail$/;
DDFileUploader = function(dropbox, uploadUrl) {
this.dropbox = dropbox;
DDFileUploader = function(dropbox, uploadUrl) {
this.dropbox = dropbox;
+ this.existingSlides = this.indexExistingSlides();
this.uploadUrl = uploadUrl;
this.slideSize = 222;
this.progressBarMaxSize = 200; // pixels
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);});
};
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);
// 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];
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();