From: Benoît Pin <pin@cri.ensmp.fr>
Date: Tue, 13 Aug 2013 09:30:28 +0000 (+0200)
Subject: Avancement du refactoring.
X-Git-Url: https://scm.cri.ensmp.fr/git/Portfolio.git/commitdiff_plain/30ba3a527054cc5c4c188b1049ef68e8ac0c69dd?hp=edfd67539f00f7719ddd0cc146d61bc49895e1d5

Avancement du refactoring.
---

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 497e30a..ff3f478 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -2,8 +2,6 @@
 var DDFileUploaderBase;
 
 (function(){
-// nombre maximun d'image chargées en local
-var MAX_PREVIEW = 2;
 
 DDFileUploaderBase = function(dropbox, uploadUrl) {
 	this.dropbox = dropbox;
@@ -41,13 +39,7 @@ DDFileUploaderBase.prototype.drop = function(evt) {
 
 // Methods about upload
 DDFileUploaderBase.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);
-	}
+	// To be implemented by descendant.
 };
 
 DDFileUploaderBase.prototype.upload = function(slide) {
@@ -121,31 +113,7 @@ DDFileUploaderBase.prototype.progressHandler = function(evt) {
 	}
 };
 
-// Method about queues
-
-DDFileUploaderBase.prototype.previewQueuePush = function(slide) {
-	this.previewQueue.push(slide);
-	if (!this._previewQueueRunning) {
-		this.startPreviewQueue();
-	}
-};
-
-DDFileUploaderBase.prototype.startPreviewQueue = function() {
-	this._previewQueueRunning = true;
-	this.previewQueueLoadNext();
-};
-
-DDFileUploaderBase.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;
-	}
-};
-
+// Methods about queue
 DDFileUploaderBase.prototype.uploadQueuePush = function(slide) {
 	this.uploadQueue.push(slide);
 	if (!this._uploadQueueRunning) {
diff --git a/skins/portfolio_upload.js b/skins/portfolio_upload.js
index 65915aa..48bdf7f 100644
--- a/skins/portfolio_upload.js
+++ b/skins/portfolio_upload.js
@@ -1,9 +1,11 @@
 // © 2013 Benoît Pin MINES ParisTech
 
 var DDImageUploader;
+var MAX_PREVIEW = 2; // à virer
 
 (function(){
-
+// nombre maximun d'image chargées en local
+var MAX_PREVIEW = 2;
 var isThumbnail = /.*\/getThumbnail$/;
 
 DDImageUploader = function(dropbox, uploadUrl) {
@@ -31,4 +33,42 @@ DDImageUploader.prototype.indexExistingSlides = function() {
 	return index;
 };
 
+// Methods about upload.
+DDImageUploader.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);
+	}
+};
+
+
+// Methods about preview queue.
+DDImageUploader.prototype.previewQueuePush = function(slide) {
+	this.previewQueue.push(slide);
+	if (!this._previewQueueRunning) {
+		this.startPreviewQueue();
+	}
+};
+
+DDImageUploader.prototype.startPreviewQueue = function() {
+	this._previewQueueRunning = true;
+	this.previewQueueLoadNext();
+};
+
+DDImageUploader.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;
+	}
+};
+
+
+
 }());
\ No newline at end of file