X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/f9b11dd5e73b24997159b899b87e20fe70e44af3..b86e0e692ec682ae14874204d52f3ffc136cb621:/skins/fileupload.js?ds=inline

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 42616a9..7229df9 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -9,12 +9,17 @@ DDFileUploader = function(dropbox, uploadUrl) {
 	this.slideSize = 222;
 	this.progressBarMaxSize = 200; // pixels
 	this.thumbnailSize = 180;
+	this.previewQueue = [];
+	this._previewQueueRunning = false;
+	this.uploadQueue = [];
+	this._uploadQueueRunning = false;
 	var self = this;
 	addListener(dropbox, 'dragenter', function(evt){self.dragenter(evt);});
 	addListener(dropbox, 'dragover', function(evt){self.dragover(evt);});
 	addListener(dropbox, 'drop', function(evt){self.drop(evt);});
 };
 
+// Drag and drop
 DDFileUploader.prototype.dragenter = function(evt) {
 	disableDefault(evt);
 	disablePropagation(evt);
@@ -28,7 +33,6 @@ DDFileUploader.prototype.dragover = function(evt) {
 	dt.dropEffect = 'copy';
 };
 
-
 DDFileUploader.prototype.drop = function(evt) {
 	disableDefault(evt);
 	disablePropagation(evt);
@@ -38,29 +42,107 @@ DDFileUploader.prototype.drop = function(evt) {
 	this.handleFiles(dt.files);
 };
 
+// Methods about upload
 DDFileUploader.prototype.handleFiles = function(files) {
-	var file, i;
+	var file, i, slide;
 	for (i = 0; i < files.length; i++) {
 		file = files[i];
-		this.createSlide();
-		this.previewUploadedImage(file);
-		this.upload(file);
+		slide = this.createSlide(file);
+		this.previewQueuePush(slide);
+		this.uploadQueuePush(slide);
+		// this.previewUploadedImage(file);
+		// this.upload(file);
 	}
 };
 
+DDFileUploader.prototype.upload = function(slide) {
+	var reader = new FileReader();
+	var req = new XMLHttpRequest();
+	var file = slide.file;
+	this.previewImg = slide.img;
+	this.progressBar = slide.progressBar;
+	var self = this;
+	
+	addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
+	addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);});
+
+	req.open("PUT", this.uploadUrl + '/' + file.name);
+	req.setRequestHeader("Content-Type", file.type);
+	addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);});
+	reader.readAsBinaryString(file);
+};
+
+DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
+	this.progressBar.parentNode.removeChild(this.progressBar);
+	this.uploadQueueLoadNext();
+};
+
+DDFileUploader.prototype.progressHandler = function(evt) {
+	if (evt.lengthComputable) {
+		var progress = evt.loaded / evt.total;
+		this.updateProgressBar(progress);
+		var currentOpacity = this.previewImg.style.opacity;
+		this.previewImg.style.opacity = Math.max(currentOpacity, progress);
+	}
+};
+
+// Method about queues
+
+DDFileUploader.prototype.previewQueuePush = function(slide) {
+	this.previewQueue.push(slide);
+	if (!this._previewQueueRunning)
+		this.startPreviewQueue();
+};
+
+DDFileUploader.prototype.startPreviewQueue = function() {
+	this._previewQueueRunning = true;
+	this.previewQueueLoadNext();
+};
+
+DDFileUploader.prototype.previewQueueLoadNext = function() {
+	var slide = this.previewQueue.shift();
+	if (slide)
+		this.previewUploadedImage(slide);
+	else
+		this._previewQueueRunning = false;
+};
+
+DDFileUploader.prototype.uploadQueuePush = function(slide) {
+	this.uploadQueue.push(slide);
+	if (!this._uploadQueueRunning)
+		this.startUploadQueue();
+};
+
+DDFileUploader.prototype.startUploadQueue = function() {
+	this._uploadQueueRunning = true;
+	this.uploadQueueLoadNext();
+};
+
+
+DDFileUploader.prototype.uploadQueueLoadNext = function() {
+	var slide = this.uploadQueue.shift();
+	if (slide)
+		this.upload(slide);
+	else
+		this._uploadQueueRunning = false;
+};
+
 
-DDFileUploader.prototype.createSlide = function() {
+// User interface
+DDFileUploader.prototype.createSlide = function(file) {
 	var slide = document.createElement('span');
+	slide.file = file;
 
 	var a = document.createElement('a');
 	a.href = '#';
 	a.className = 'slide';
 
 	var img = document.createElement('img');
-	this.previewImg = img;
+	img.className = 'hidden';
 	var size = this.thumbnailSize;
 	var self = this;
 	img.onload = function(evt) {
+		console.info('createSlide loaded.')
 		if (img.width > img.height) { // landscape
 			img.height = Math.round(size * img.height / img.width);
 			img.width = size;
@@ -71,17 +153,22 @@ DDFileUploader.prototype.createSlide = function() {
 		}
 		img.style.marginLeft = Math.round((self.slideSize - img.width) / 2) + 'px';
 		img.style.marginTop = Math.round((self.slideSize - img.height) / 2) + 'px';
+		img.style.opacity = 0.2;
 		img.className = undefined;
 	};
 	a.appendChild(img);
+	slide.img = img;
 
 	var progressBar = document.createElement('span');
 	progressBar.className = 'upload-progress';
+	slide.progressBar = progressBar;
 
 	slide.appendChild(a);
 	slide.appendChild(progressBar);
-	this.progressBar = progressBar;
+	// this.progressBar = progressBar;
 	this.dropbox.appendChild(slide);
+	
+	return slide;
 };
 
 DDFileUploader.prototype.updateProgressBar = function(progress) {
@@ -89,49 +176,20 @@ DDFileUploader.prototype.updateProgressBar = function(progress) {
 	var size = this.progressBarMaxSize * progress;
 	size = Math.round(size);
 	this.progressBar.style.width = size + 'px';
-}
-
-
-DDFileUploader.prototype.upload = function(file) {
-	var reader = new FileReader();
-	var req = new XMLHttpRequest();
-	var self = this;
-	
-	addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
-	addListener(req.upload, 'load', function(evt){self.uploadCompleteHandler(evt);});
-
-	req.open("PUT", this.uploadUrl + '/' + file.name);
-	req.setRequestHeader("Content-Type", file.type);
-	addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);})
-	// reader.onload = function(evt) {
-	// 	req.sendAsBinary(evt.target.result);
-	// };
-	reader.readAsBinaryString(file);
-};
-
-DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
-	this.progressBar.parentNode.removeChild(this.progressBar);
-};
-
-DDFileUploader.prototype.progressHandler = function(evt) {
-	if (evt.lengthComputable) {
-		var progress = evt.loaded / evt.total;
-		this.updateProgressBar(progress);
-		this.previewImg.style.opacity=progress;
-	}
 };
 
-DDFileUploader.prototype.previewUploadedImage = function(file) {
+DDFileUploader.prototype.previewUploadedImage = function(slide) {
 	var reader = new FileReader();
-	var img = this.previewImg;
 	var size = this.thumbnailSize;
-	
-	img.className = 'hidden';
+	var self = this;
 	
 	reader.onload = function(evt) {
-		img.src = evt.target.result;
+		console.info('previewUploadedImage loaded.')
+		slide.img.src = evt.target.result;
+		setTimeout(function(){self.previewQueueLoadNext();}, 1000);
+		// self.previewQueueLoadNext();
 	};
-	reader.readAsDataURL(file);
+	reader.readAsDataURL(slide.file);
 };
 
 }());