From: Benoît Pin <pin@cri.ensmp.fr>
Date: Tue, 13 Aug 2013 09:37:10 +0000 (+0200)
Subject: Refactoring : déplacement des méthodes spécifiques à l'affichage de l'interface utili... 
X-Git-Url: https://scm.cri.ensmp.fr/git/Portfolio.git/commitdiff_plain/8edf2ae1a38ce8f16c551accdbfa4d418fe4101e

Refactoring : déplacement des méthodes spécifiques à l'affichage de l'interface utilisateur.
---

diff --git a/skins/fileupload.js b/skins/fileupload.js
index ff3f478..a98dda5 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -126,7 +126,6 @@ DDFileUploaderBase.prototype.startUploadQueue = function() {
 	this.uploadQueueLoadNext();
 };
 
-
 DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
 	var slide = this.uploadQueue.shift();
 	if (slide) {
@@ -137,71 +136,4 @@ DDFileUploaderBase.prototype.uploadQueueLoadNext = function() {
 	}
 };
 
-
-// User interface
-DDFileUploaderBase.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) {
-		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.floor((self.slideSize - img.width) / 2) + 'px';
-		img.style.marginTop = Math.floor((self.slideSize - img.height) / 2) + 'px';
-		img.style.opacity = 0.2;
-		img.className = undefined;
-	};
-	a.appendChild(img);
-	slide.img = img;
-	
-	var label = document.createElement('span');
-	slide.label = label;
-	label.className = 'label';
-	label.innerHTML = file.name;
-
-	var progressBar = document.createElement('span');
-	progressBar.className = 'upload-progress';
-	slide.progressBar = progressBar;
-
-	slide.appendChild(a);
-	slide.appendChild(progressBar);
-	slide.appendChild(label);
-	this.dropbox.appendChild(slide);
-	
-	return slide;
-};
-
-DDFileUploaderBase.prototype.updateProgressBar = function(progress) {
-	// 0 <= progress <= 1
-	var size = this.progressBarMaxSize * progress;
-	size = Math.round(size);
-	this.progressBar.style.width = size + 'px';
-};
-
-DDFileUploaderBase.prototype.previewUploadedImage = function(slide) {
-	var reader = new FileReader();
-	var size = this.thumbnailSize;
-	var self = this;
-	
-	reader.onload = function(evt) {
-		slide.img.src = evt.target.result;
-		setTimeout(function(){self.previewQueueLoadNext();}, 500);
-	};
-	reader.readAsDataURL(slide.file);
-};
-
 }());
diff --git a/skins/portfolio_upload.js b/skins/portfolio_upload.js
index 48bdf7f..c4b7982 100644
--- a/skins/portfolio_upload.js
+++ b/skins/portfolio_upload.js
@@ -69,6 +69,71 @@ DDImageUploader.prototype.previewQueueLoadNext = function() {
 	}
 };
 
+// User interface
+DDImageUploader.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) {
+		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.floor((self.slideSize - img.width) / 2) + 'px';
+		img.style.marginTop = Math.floor((self.slideSize - img.height) / 2) + 'px';
+		img.style.opacity = 0.2;
+		img.className = undefined;
+	};
+	a.appendChild(img);
+	slide.img = img;
+	
+	var label = document.createElement('span');
+	slide.label = label;
+	label.className = 'label';
+	label.innerHTML = file.name;
+
+	var progressBar = document.createElement('span');
+	progressBar.className = 'upload-progress';
+	slide.progressBar = progressBar;
+
+	slide.appendChild(a);
+	slide.appendChild(progressBar);
+	slide.appendChild(label);
+	this.dropbox.appendChild(slide);
+	
+	return slide;
+};
+
+DDImageUploader.prototype.updateProgressBar = function(progress) {
+	// 0 <= progress <= 1
+	var size = this.progressBarMaxSize * progress;
+	size = Math.round(size);
+	this.progressBar.style.width = size + 'px';
+};
+
+DDImageUploader.prototype.previewUploadedImage = function(slide) {
+	var reader = new FileReader();
+	var size = this.thumbnailSize;
+	var self = this;
+	
+	reader.onload = function(evt) {
+		slide.img.src = evt.target.result;
+		setTimeout(function(){self.previewQueueLoadNext();}, 500);
+	};
+	reader.readAsDataURL(slide.file);
+};
 
 
 }());
\ No newline at end of file