X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/02999acb0be0fa738cebfc080c3517a567564e80..30ba3a527054cc5c4c188b1049ef68e8ac0c69dd:/skins/fileupload.js?ds=sidebyside

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 3f5f8c5..ff3f478 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -1,21 +1,11 @@
 // © 2013 Benoît Pin MINES ParisTech
-var DDFileUploader;
+var DDFileUploaderBase;
 
 (function(){
-// nombre maximun d'image chargées en local
-var MAX_PREVIEW = 2;
-var isThumbnail = /.*\/getThumbnail$/;
 
-DDFileUploader = function(dropbox, uploadUrl) {
+DDFileUploaderBase = function(dropbox, uploadUrl) {
 	this.dropbox = dropbox;
-	this.existingSlides = this.indexExistingSlides();
 	this.uploadUrl = uploadUrl;
-	this.slideSize = 222;
-	this.progressBarMaxSize = 200; // pixels
-	this.thumbnailSize = 180;
-	this.previewQueue = [];
-	this._previewQueueRunning = false;
-	this.previewsLoaded = 0;
 	this.uploadQueue = [];
 	this._uploadQueueRunning = false;
 	var self = this;
@@ -24,25 +14,13 @@ DDFileUploader = function(dropbox, uploadUrl) {
 	addListener(dropbox, 'drop', function(evt){self.drop(evt);});
 };
 
-DDFileUploader.prototype.indexExistingSlides = function() {
-	var images = this.dropbox.getElementsByTagName('img');
-	var i;
-	var index = [];
-	for (i=0 ; i < images.length ; i++) {
-		if (isThumbnail.test(images[i].src)) {
-			index[images[i].src] = images[i];
-		}
-	}
-	return index;
-};
-
 // 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);
@@ -50,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);
@@ -60,17 +38,11 @@ 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);
-	}
+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;
@@ -100,7 +72,7 @@ DDFileUploader.prototype.upload = function(slide) {
 	reader.readAsBinaryString(file);
 };
 
-DDFileUploader.prototype.uploadCompleteHandler = function(req) {
+DDFileUploaderBase.prototype.uploadCompleteHandler = function(req) {
 	var slide = this.uploadedSlide;
 	this.uploadedSlide.removeChild(slide.label);
     this.uploadedSlide.removeChild(slide.progressBar);
@@ -132,7 +104,7 @@ DDFileUploader.prototype.uploadCompleteHandler = function(req) {
 	this.uploadQueueLoadNext();
 };
 
-DDFileUploader.prototype.progressHandler = function(evt) {
+DDFileUploaderBase.prototype.progressHandler = function(evt) {
 	if (evt.lengthComputable) {
 		var progress = evt.loaded / evt.total;
 		this.updateProgressBar(progress);
@@ -141,45 +113,21 @@ 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() {
-	if (this.previewQueue.length && this.previewsLoaded < MAX_PREVIEW) {
-		var slide = this.previewQueue.shift();
-		this.previewUploadedImage(slide);
-		this.previewsLoaded++;
-	}
-	else {
-		this._previewQueueRunning = false;
-	}
-};
-
-DDFileUploader.prototype.uploadQueuePush = function(slide) {
+// Methods about queue
+DDFileUploaderBase.prototype.uploadQueuePush = function(slide) {
 	this.uploadQueue.push(slide);
 	if (!this._uploadQueueRunning) {
 		this.startUploadQueue();
 	}
 };
 
-DDFileUploader.prototype.startUploadQueue = function() {
+DDFileUploaderBase.prototype.startUploadQueue = function() {
 	this._uploadQueueRunning = true;
 	this.uploadQueueLoadNext();
 };
 
 
-DDFileUploader.prototype.uploadQueueLoadNext = function() {
+DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
 	var slide = this.uploadQueue.shift();
 	if (slide) {
 		this.upload(slide);
@@ -191,7 +139,7 @@ DDFileUploader.prototype.uploadQueueLoadNext = function() {
 
 
 // User interface
-DDFileUploader.prototype.createSlide = function(file) {
+DDFileUploaderBase.prototype.createSlide = function(file) {
 	var slide = document.createElement('span');
 	slide.file = file;
 
@@ -237,14 +185,14 @@ DDFileUploader.prototype.createSlide = function(file) {
 	return slide;
 };
 
-DDFileUploader.prototype.updateProgressBar = function(progress) {
+DDFileUploaderBase.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) {
+DDFileUploaderBase.prototype.previewUploadedImage = function(slide) {
 	var reader = new FileReader();
 	var size = this.thumbnailSize;
 	var self = this;