X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/336147fc44b6afca59a60c2094824a2a89b5a0de..02643dc71034e01a60f505cdc0887ae79314a3ed:/skins/fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index a98dda5..bf36628 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -42,13 +42,20 @@ DDFileUploaderBase.prototype.handleFiles = function(files) {
 	// To be implemented by descendant.
 };
 
-DDFileUploaderBase.prototype.upload = function(slide) {
+
+
+DDFileUploaderBase.prototype.beforeUpload = function(item) {
+	// To be implemented by decendant.
+};
+
+
+DDFileUploaderBase.prototype.upload = function(item) {
+	// item.file must be the file to be uploaded
+	this.beforeUpload(item);
 	var reader = new FileReader();
 	var req = new XMLHttpRequest();
-	var file = slide.file;
-	this.uploadedSlide = slide;
-	this.previewImg = slide.img;
-	this.progressBar = slide.progressBar;
+	var file = item.file;
+	
 	var self = this;
 	
 	addListener(req.upload, 'progress', function(evt){self.progressHandler(evt);});
@@ -72,50 +79,31 @@ DDFileUploaderBase.prototype.upload = function(slide) {
 	reader.readAsBinaryString(file);
 };
 
+
+DDFileUploaderBase.prototype.uploadCompleteHandlerCB = function(req) {
+	// To be implemented by descendant.
+};
+
 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.uploadCompleteHandlerCB(req);
 	this.uploadQueueLoadNext();
 };
 
+DDFileUploaderBase.prototype.progressHandlerCB = function(progress) {
+	// To be implemented by descendant.
+	// 0 <= progress <= 1
+};
+
 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);
+		this.progressHandlerCB(progress);
 	}
 };
 
 // Methods about queue
-DDFileUploaderBase.prototype.uploadQueuePush = function(slide) {
-	this.uploadQueue.push(slide);
+DDFileUploaderBase.prototype.uploadQueuePush = function(item) {
+	this.uploadQueue.push(item);
 	if (!this._uploadQueueRunning) {
 		this.startUploadQueue();
 	}
@@ -127,9 +115,9 @@ DDFileUploaderBase.prototype.startUploadQueue = function() {
 };
 
 DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
-	var slide = this.uploadQueue.shift();
-	if (slide) {
-		this.upload(slide);
+	var item = this.uploadQueue.shift();
+	if (item) {
+		this.upload(item);
 	}
 	else {
 		this._uploadQueueRunning = false;