From 934c239d0815781f05245f4b88fd8ac3a73452d3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Tue, 23 Jul 2013 14:01:23 +0200
Subject: [PATCH] =?utf8?q?Finitions,=20cosm=C3=A9tique=20et=20nettoyage.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
skins/fileupload.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/skins/fileupload.js b/skins/fileupload.js
index 65a2984..2b6c4a8 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -3,7 +3,7 @@ var DDFileUploader;
(function(){
// nombre maximun d'image chargées en local
-var MAX_PREVIEW = 5;
+var MAX_PREVIEW = 2;
DDFileUploader = function(dropbox, uploadUrl) {
this.dropbox = dropbox;
@@ -90,7 +90,11 @@ 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];
+ img.onload = function(evt) {
+ slide.parentNode.replaceChild(fragment, slide);
+ };
this.previewsLoaded--;
this.previewQueueLoadNext();
this.uploadQueueLoadNext();
@@ -122,12 +126,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 +180,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;
};
--
2.20.1