X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/e311b4c86acdfe7fd6b930436d49852e5ebfc75d..38be86f2f98073dafe8450220f250eccd8f5f827:/skins/fileupload.js?ds=inline

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 04fde67..c202bfe 100644
--- 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,7 +51,7 @@ DDFileUploader.prototype.handleFiles = function(files) {
 	for (i = 0; i < files.length; i++) {
 		file = files[i];
 		slide = this.createSlide(file);
-        // this.previewQueuePush(slide);
+        this.previewQueuePush(slide);
         this.uploadQueuePush(slide);
 	}
 };
@@ -63,10 +66,9 @@ DDFileUploader.prototype.upload = function(slide) {
 	var self = this;
 	
 	addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
-	// addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt, req);});
 	addListener(req, 'readystatechange',
 		function(evt) {
-			if (req.readyState == 4) {
+			if (req.readyState === 4) {
 				self.uploadCompleteHandler(req);
 			}
 		});
@@ -88,7 +90,17 @@ 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) {
+		// 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();
 };
 
@@ -116,9 +128,10 @@ 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);
+		this.previewsLoaded++;
 	}
 	else {
 		this._previewQueueRunning = false;
@@ -171,8 +184,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;
 	};