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

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 7229df9..5a69929 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -1,16 +1,11 @@
 // © 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.slideSize = 222;
-	this.progressBarMaxSize = 200; // pixels
-	this.thumbnailSize = 180;
-	this.previewQueue = [];
-	this._previewQueueRunning = false;
 	this.uploadQueue = [];
 	this._uploadQueueRunning = false;
 	var self = this;
@@ -20,12 +15,12 @@ DDFileUploader = function(dropbox, uploadUrl) {
 };
 
 // Drag and drop
-DDFileUploader.prototype.dragenter = function(evt) {
+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);
@@ -33,7 +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);
@@ -43,41 +38,73 @@ DDFileUploader.prototype.drop = function(evt) {
 };
 
 // Methods about upload
-DDFileUploader.prototype.handleFiles = function(files) {
-	var file, i, slide;
-	for (i = 0; i < files.length; i++) {
-		file = files[i];
-		slide = this.createSlide(file);
-		this.previewQueuePush(slide);
-		this.uploadQueuePush(slide);
-		// this.previewUploadedImage(file);
-		// this.upload(file);
-	}
+DDFileUploaderBase.prototype.handleFiles = function(files) {
+	// To be implemented by descendant.
 };
 
-DDFileUploader.prototype.upload = function(slide) {
+DDFileUploaderBase.prototype.upload = function(slide) {
 	var reader = new FileReader();
 	var req = new XMLHttpRequest();
 	var file = slide.file;
+	this.uploadedSlide = slide;
 	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);
+	addListener(req, 'readystatechange',
+		function(evt) {
+			if (req.readyState === 4) {
+				self.uploadCompleteHandler(req);
+			}
+		});
+
+	req.open("PUT", this.uploadUrl);
 	req.setRequestHeader("Content-Type", file.type);
-	addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);});
+	req.setRequestHeader("X-File-Name", file.name);
+	addListener(reader, 'load',
+		function(evt){
+			try {
+				req.sendAsBinary(evt.target.result);
+			}
+			catch(e){}
+		});
 	reader.readAsBinaryString(file);
 };
 
-DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
-	this.progressBar.parentNode.removeChild(this.progressBar);
+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();
 };
 
-DDFileUploader.prototype.progressHandler = function(evt) {
+DDFileUploaderBase.prototype.progressHandler = function(evt) {
 	if (evt.lengthComputable) {
 		var progress = evt.loaded / evt.total;
 		this.updateProgressBar(progress);
@@ -86,110 +113,27 @@ DDFileUploader.prototype.progressHandler = function(evt) {
 	}
 };
 
-// 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)
+// Methods about queue
+DDFileUploaderBase.prototype.uploadQueuePush = function(item) {
+	this.uploadQueue.push(item);
+	if (!this._uploadQueueRunning) {
 		this.startUploadQueue();
+	}
 };
 
-DDFileUploader.prototype.startUploadQueue = function() {
+DDFileUploaderBase.prototype.startUploadQueue = function() {
 	this._uploadQueueRunning = true;
 	this.uploadQueueLoadNext();
 };
 
-
-DDFileUploader.prototype.uploadQueueLoadNext = function() {
-	var slide = this.uploadQueue.shift();
-	if (slide)
-		this.upload(slide);
-	else
+DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
+	var item = this.uploadQueue.shift();
+	if (item) {
+		this.upload(item);
+	}
+	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) {
-		console.info('createSlide loaded.')
-		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.progressBar = 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 size = this.thumbnailSize;
-	var self = this;
-	
-	reader.onload = function(evt) {
-		console.info('previewUploadedImage loaded.')
-		slide.img.src = evt.target.result;
-		setTimeout(function(){self.previewQueueLoadNext();}, 1000);
-		// self.previewQueueLoadNext();
-	};
-	reader.readAsDataURL(slide.file);
+	}
 };
 
 }());