X-Git-Url: https://scm.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/a48e70e823ff9ff92f57048cf1cecb358fdfdf3b..8718d5e7245d0d80356e915c7d1b0f7f97b33ddf:/skins/fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 77d7b03..8f6eeda 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,8 +51,8 @@ DDFileUploader.prototype.handleFiles = function(files) {
 	for (i = 0; i < files.length; i++) {
 		file = files[i];
 		slide = this.createSlide(file);
-        // this.previewQueuePush(slide);
-        // this.uploadQueuePush(slide);
+        this.previewQueuePush(slide);
+        this.uploadQueuePush(slide);
 	}
 };
 
@@ -63,13 +66,18 @@ 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);});
+	addListener(req, 'readystatechange',
+		function(evt) {
+			if (req.readyState === 4) {
+				self.uploadCompleteHandler(req);
+			}
+		});
 
-	req.open("PUT", this.uploadUrl + '/' + file.name);
+	req.open("PUT", this.uploadUrl);
 	req.setRequestHeader("Content-Type", file.type);
+	req.setRequestHeader("X-File-Name", file.name);
 	addListener(reader, 'load',
 		function(evt){
-			console.info('load');
 			try {
 				req.sendAsBinary(evt.target.result);
 			}
@@ -78,10 +86,19 @@ DDFileUploader.prototype.upload = function(slide) {
 	reader.readAsBinaryString(file);
 };
 
-DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
+DDFileUploader.prototype.uploadCompleteHandler = function(req) {
 	var slide = this.uploadedSlide;
 	this.uploadedSlide.removeChild(slide.label);
     this.uploadedSlide.removeChild(slide.progressBar);
+	var fragment = getCopyOfNode(req.responseXML.documentElement.firstChild);
+	var img = fragment.getElementsByTagName('img')[0];
+	img.onload = function(evt) {
+		var preview = slide.getElementsByTagName('img')[0];
+		preview.src = undefined;
+		slide.parentNode.replaceChild(fragment, slide);
+	};
+	this.previewsLoaded--;
+	this.previewQueueLoadNext();
 	this.uploadQueueLoadNext();
 };
 
@@ -109,9 +126,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;
@@ -164,8 +182,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;
 	};