X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/ca145da7179f782b6c371fef1737bb3df00c43bd..336147fc44b6afca59a60c2094824a2a89b5a0de:/skins/fileupload.js?ds=inline

diff --git a/skins/fileupload.js b/skins/fileupload.js
index d1da59e..a98dda5 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -1,23 +1,26 @@
 // © 2013 Benoît Pin MINES ParisTech
-var DDFileUploader;
+var DDFileUploaderBase;
 
 (function(){
 
-DDFileUploader = function(dropbox, uploadUrl) {
+DDFileUploaderBase = function(dropbox, uploadUrl) {
 	this.dropbox = dropbox;
 	this.uploadUrl = uploadUrl;
+	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);});
 };
 
-DDFileUploader.prototype.dragenter = function(evt) {
+// Drag and drop
+DDFileUploaderBase.prototype.dragenter = function(evt) {
 	disableDefault(evt);
 	disablePropagation(evt);
 };
 
-DDFileUploader.prototype.dragover = function(evt) {
+DDFileUploaderBase.prototype.dragover = function(evt) {
 	disableDefault(evt);
 	disablePropagation(evt);
 	evt = getEventObject(evt);
@@ -25,8 +28,7 @@ DDFileUploader.prototype.dragover = function(evt) {
 	dt.dropEffect = 'copy';
 };
 
-
-DDFileUploader.prototype.drop = function(evt) {
+DDFileUploaderBase.prototype.drop = function(evt) {
 	disableDefault(evt);
 	disablePropagation(evt);
 	getEventObject(evt);
@@ -35,41 +37,103 @@ DDFileUploader.prototype.drop = function(evt) {
 	this.handleFiles(dt.files);
 };
 
-DDFileUploader.prototype.handleFiles = function(files) {
-	var file, i;
-	for (i = 0; i < files.length; i++) {
-		file = files[i];
-		console.log(file.type);
-		this.upload(file);
-	}
+// Methods about upload
+DDFileUploaderBase.prototype.handleFiles = function(files) {
+	// To be implemented by descendant.
 };
 
-
-DDFileUploader.prototype.upload = function(file) {
+DDFileUploaderBase.prototype.upload = function(slide) {
 	var reader = new FileReader();
-	var xhr = new XMLHttpRequest();
-	var percentage;
+	var req = new XMLHttpRequest();
+	var file = slide.file;
+	this.uploadedSlide = slide;
+	this.previewImg = slide.img;
+	this.progressBar = slide.progressBar;
 	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);
+	
+	addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
+	addListener(req, 'readystatechange',
+		function(evt) {
+			if (req.readyState === 4) {
+				self.uploadCompleteHandler(req);
+			}
+		});
 
-	// 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);
-	};
+	req.open("PUT", this.uploadUrl);
+	req.setRequestHeader("Content-Type", file.type);
+	req.setRequestHeader("X-File-Name", file.name);
+	addListener(reader, 'load',
+		function(evt){
+			try {
+				req.sendAsBinary(evt.target.result);
+			}
+			catch(e){}
+		});
 	reader.readAsBinaryString(file);
 };
 
+DDFileUploaderBase.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];
+	if (req.status === 200) {
+		// update
+		var existing = this.existingSlides[img.src];
+		if (existing) {
+			existing.src = existing.src + '?' + Math.random().toString();
+		}
+		slide.img.src = '';
+		slide.img.parentNode.removeChild(slide.img);
+		slide.img = undefined;
+		slide.parentNode.removeChild(slide);
+	}
+	else if(req.status === 201) {
+		// creation
+		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();
+};
+
+DDFileUploaderBase.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);
+	}
+};
+
+// Methods about queue
+DDFileUploaderBase.prototype.uploadQueuePush = function(slide) {
+	this.uploadQueue.push(slide);
+	if (!this._uploadQueueRunning) {
+		this.startUploadQueue();
+	}
+};
+
+DDFileUploaderBase.prototype.startUploadQueue = function() {
+	this._uploadQueueRunning = true;
+	this.uploadQueueLoadNext();
+};
+
+DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
+	var slide = this.uploadQueue.shift();
+	if (slide) {
+		this.upload(slide);
+	}
+	else {
+		this._uploadQueueRunning = false;
+	}
+};
+
 }());