X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/b1a410249bab9d49ec42b4138501bf72cfe544ea..da5eed398d4e0b1945dc81d5a2d741db12ab84d9:/skins/fileupload.js?ds=sidebyside

diff --git a/skins/fileupload.js b/skins/fileupload.js
index d1da59e..980fb44 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -6,12 +6,20 @@ var DDFileUploader;
 DDFileUploader = function(dropbox, uploadUrl) {
 	this.dropbox = dropbox;
 	this.uploadUrl = 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);
@@ -25,7 +33,6 @@ DDFileUploader.prototype.dragover = function(evt) {
 	dt.dropEffect = 'copy';
 };
 
-
 DDFileUploader.prototype.drop = function(evt) {
 	disableDefault(evt);
 	disablePropagation(evt);
@@ -35,41 +42,154 @@ 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];
-		console.log(file.type);
-		this.upload(file);
+		slide = this.createSlide(file);
+		this.previewQueuePush(slide);
+		this.uploadQueuePush(slide);
+	}
+};
+
+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.upload = function(file) {
+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;
+	}
+};
+
+
+// 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');
+	img.className = 'hidden';
+	var size = this.thumbnailSize;
+	var self = this;
+	img.onload = function(evt) {
+		if (img.width > img.height) { // landscape
+			img.height = Math.round(size * img.height / img.width);
+			img.width = size;
+		}
+		else {
+			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.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.dropbox.appendChild(slide);
+	
+	return slide;
+};
+
+DDFileUploader.prototype.updateProgressBar = function(progress) {
+	// 0 <= progress <= 1
+	var size = this.progressBarMaxSize * progress;
+	size = Math.round(size);
+	this.progressBar.style.width = size + 'px';
+};
+
+DDFileUploader.prototype.previewUploadedImage = function(slide) {
 	var reader = new FileReader();
-	var xhr = new XMLHttpRequest();
-	var percentage;
+	var size = this.thumbnailSize;
 	var self = this;
-	// this.xhr.upload.addEventListener("progress", function(e) {
-	// 	if (e.lengthComputable) {
-	// 		var percentage = Math.round((e.loaded * 100) / e.total);
-	// 		self.ctrl.update(percentage);
-	// 	}
-	// }, false);
-
-	// xhr.upload.addEventListener("load", function(e){
-	//   self.ctrl.update(100);
-	//   var canvas = self.ctrl.ctx.canvas;
-	//   canvas.parentNode.removeChild(canvas);
-	//  }, false);
-	console.log(file);
-	xhr.open("PUT", this.uploadUrl + '/' + file.name);
-	xhr.setRequestHeader("Content-Type", file.type);
-	// xhr.overrideMimeType('text/plain; charset=x-user-defined-binary');
+	
 	reader.onload = function(evt) {
-		xhr.sendAsBinary(evt.target.result);
+		slide.img.src = evt.target.result;
+		setTimeout(function(){self.previewQueueLoadNext();}, 500);
 	};
-	reader.readAsBinaryString(file);
+	reader.readAsDataURL(slide.file);
 };
 
 }());