From: Benoît Pin <pin@cri.ensmp.fr>
Date: Fri, 19 Jul 2013 20:59:13 +0000 (+0200)
Subject: Ajout du nom du fichier avant upload.
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Portfolio.git/commitdiff_plain/92e04ad0c0fc1668c8b175017be7a96d8d30e5af

Ajout du nom du fichier avant upload.
---

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 980fb44..8e09907 100644
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -57,6 +57,7 @@ DDFileUploader.prototype.upload = function(slide) {
 	var reader = new FileReader();
 	var req = new XMLHttpRequest();
 	var file = slide.file;
+	this.uploadedSlide = slide;
 	this.previewImg = slide.img;
 	this.progressBar = slide.progressBar;
 	var self = this;
@@ -66,12 +67,21 @@ DDFileUploader.prototype.upload = function(slide) {
 
 	req.open("PUT", this.uploadUrl + '/' + file.name);
 	req.setRequestHeader("Content-Type", file.type);
-	addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);});
+	addListener(reader, 'load',
+		function(evt){
+			console.info('load');
+			try {
+				req.sendAsBinary(evt.target.result);
+			}
+			catch(e){}
+		});
 	reader.readAsBinaryString(file);
 };
 
 DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
-	this.progressBar.parentNode.removeChild(this.progressBar);
+	var slide = this.uploadedSlide;
+	this.uploadedSlide.removeChild(slide.label);
+	this.uploadedSlide.removeChild(slide.label);
 	this.uploadQueueLoadNext();
 };
 
@@ -161,6 +171,11 @@ DDFileUploader.prototype.createSlide = function(file) {
 	};
 	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';
@@ -168,6 +183,7 @@ DDFileUploader.prototype.createSlide = function(file) {
 
 	slide.appendChild(a);
 	slide.appendChild(progressBar);
+	slide.appendChild(label);
 	this.dropbox.appendChild(slide);
 	
 	return slide;
diff --git a/skins/portfolio_style.css.dtml b/skins/portfolio_style.css.dtml
index 7751fbb..e2aadab 100755
--- a/skins/portfolio_style.css.dtml
+++ b/skins/portfolio_style.css.dtml
@@ -310,6 +310,13 @@ div.lightbox {
   top:208px;
 }
 
+.lightbox span.label {
+  position: relative;
+  padding-left:0.5em;
+  top: -4px;
+/*  border: 1px solid red;*/
+}
+
 .image_toolbar {
   background: url(&dtml-portal_url;/image_toolbar_bg.gif) repeat-x;
   position:relative;