X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/8edf2ae1a38ce8f16c551accdbfa4d418fe4101e..b2f7492bbdef474919330ff5a3404b8795036314:/skins/fileupload.js

diff --git a/skins/fileupload.js b/skins/fileupload.js
index a98dda5..318f059 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);});
@@ -104,18 +111,21 @@ DDFileUploaderBase.prototype.uploadCompleteHandler = function(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 +137,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;