X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/fcf65c49c21cf42f3628500e8713efe8e0dfb5c8..1a28edcbf9b0c46fbab9bcc9fff0b065349f8f24:/skins/portfolio_upload.js?ds=sidebyside

diff --git a/skins/portfolio_upload.js b/skins/portfolio_upload.js
index 653e802..87a70e4 100644
--- a/skins/portfolio_upload.js
+++ b/skins/portfolio_upload.js
@@ -1,20 +1,19 @@
 // © 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) {
+DDImageUploader = function(dropbox, uploadUrl, options) {
 	DDFileUploaderBase.apply(this, [dropbox, uploadUrl]);
 
 	this.existingSlides = this.indexExistingSlides();
-	this.slideSize = 222;
-	this.progressBarMaxSize = 200; // pixels
-	this.thumbnailSize = 180;
+	this.slideSize = options.slideSize || 222; // pixels
+	this.progressBarMaxSize = this.slideSize - 22 || 200; 
+	this.thumbnailSize = options.thumbnailSize || 180;
 	this.previewQueue = [];
 	this._previewQueueRunning = false;
 	this.previewsLoaded = 0;
@@ -48,8 +47,52 @@ DDImageUploader.prototype.beforeUpload = function(slide) {
 	this.uploadedSlide = slide;
 	this.previewImg = slide.img;
 	this.progressBar = slide.progressBar;
+	this.scrollToSlide(slide);
 };
 
+DDImageUploader.prototype.scrollToSlide = function(slide) {
+	var slideHeight = slide.offsetHeight;
+	var slideOffsetTop = slide.getElementsByClassName('slide')[0].offsetTop;
+	var to = slideOffsetTop - getWindowHeight() + slideHeight;
+	window.scroll(0, to);
+};
+
+DDImageUploader.prototype.uploadCompleteHandlerCB = function(req) {
+	var slide = this.uploadedSlide;
+	this.uploadedSlide.removeChild(slide.label);
+    this.uploadedSlide.removeChild(slide.progressBar);
+	var fragment = getCopyOfNode(req.responseXML.documentElement.firstChild);
+	var img = fragment.getElementsByTagName('img')[0];
+	if (req.status === 200) {
+		// update
+		var existing = this.existingSlides[img.src];
+		if (existing) {
+			existing.src = existing.src + '?' + Math.random().toString();
+		}
+		slide.img.src = '';
+		slide.img.parentNode.removeChild(slide.img);
+		slide.img = undefined;
+		slide.parentNode.removeChild(slide);
+	}
+	else if(req.status === 201) {
+		// creation
+		img.onload = function(evt) {
+			// accelerate GC before replacing
+			slide.img.src = '';
+			slide.img.parentNode.removeChild(slide.img);
+			slide.img = undefined;
+			slide.parentNode.replaceChild(fragment, slide);
+		};
+	}
+	this.previewsLoaded--;
+	this.previewQueueLoadNext();
+};
+
+DDImageUploader.prototype.progressHandlerCB = function(progress) {
+	this.updateProgressBar(progress);
+	var currentOpacity = this.previewImg.style.opacity;
+	this.previewImg.style.opacity = Math.max(currentOpacity, progress);
+};
 
 // Methods about preview queue.
 DDImageUploader.prototype.previewQueuePush = function(slide) {
@@ -141,5 +184,4 @@ DDImageUploader.prototype.previewUploadedImage = function(slide) {
 	reader.readAsDataURL(slide.file);
 };
 
-
 }());
\ No newline at end of file