X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/3940d117b095679f682c973f0bdc83e877b214e6..6abfa75e909be774c2e52e3442c08507f64c1419:/skins/photo_lightbox_viewer.js?ds=sidebyside

diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index d659ac1..cffa157 100644
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -11,20 +11,20 @@ var Lightbox;
 
 var reSelected = /.*selected.*/;
 
-Lightbox = function(grid, toolbar, complete) {
+Lightbox = function(grid, toolbar, complete, container_type) {
 	var self = this;
 	this.grid = grid;
-	this.lastSlide = this.grid.children[this.grid.children.length-1];
+	this._buildSlidesIndex(); // set this.slides and this.lastSlide;
 	this.fetchingDisabled = false;
 	this.complete = complete;
-	console.log('complete:', complete)
+	this.container_type = container_type;
 	this.toolbar = toolbar;
 	if (toolbar) {
 		this.toolbarFixed = false;
 		addListener(window, 'scroll', function(evt){self.windowScrollToolbarlHandler(evt);});
 	}
 	addListener(window, 'scroll', function(evt){self.windowScrollGridHandler(evt);});
-	addListener(window, 'load', function(evt){ self.windowScrollGridHandler();});
+	registerStartupFunction(function(){ self.windowScrollGridHandler();});
 	this.lastCBChecked = undefined;
 	this.form = undefined;
 	var parent = this.grid.parentNode;
@@ -45,15 +45,33 @@ Lightbox = function(grid, toolbar, complete) {
 		fm.onBeforeSubmit = function(fm_, evt) {return self.onBeforeSubmit(fm_, evt);};
 		fm.onResponseLoad = function(req) {return self.onResponseLoad(req);};
 	}
+
+	// drag and drop
+	this.disableDefaultDragging();
+	addListener(this.grid, 'dragstart', function(evt){self.onDragStart(evt);});
+	addListener(this.grid, 'dragover', function(evt){self.onDragOver(evt);});
+	addListener(this.grid, 'dragend', function(evt){self.onDragEnd(evt);});
+};
+
+Lightbox.prototype._buildSlidesIndex = function() {
+	this.slides = [];
+	var node, i;
+	for (i=0 ; i<this.grid.childNodes.length ; i++) {
+		node = this.grid.childNodes[i];
+		if (node.nodeType === 1) { // is element
+			this.slides.push(node);
+		}
+	}
+	this.lastSlide = this.slides[this.slides.length-1];
 };
 
 Lightbox.prototype.windowScrollToolbarlHandler = function(evt) {
-	if (this.toolbar.offsetTop < window.scrollY && !this.toolbarFixed) {
+	if (this.toolbar.offsetTop < getWindowScrollY() && !this.toolbarFixed) {
 		this.toolbarFixed = true;
 		this.backThreshold = this.toolbar.offsetTop;
 		this.switchToolBarPositioning(true);
 	}
-	else if (this.toolbarFixed && window.scrollY < this.backThreshold) {
+	else if (this.toolbarFixed && getWindowScrollY() < this.backThreshold) {
 		this.toolbarFixed = false;
 		this.switchToolBarPositioning(false);
 	}
@@ -61,7 +79,9 @@ Lightbox.prototype.windowScrollToolbarlHandler = function(evt) {
 Lightbox.prototype.windowScrollGridHandler = function(evt) {
 	if (!this.complete &&
 		!this.fetchingDisabled &&
-		window.scrollY > this.lastSlide.firstElementChild.offsetTop - getWindowHeight()) {
+		getWindowScrollY() >
+			(this.lastSlide.firstElementChild || this.lastSlide.children[0]).offsetTop
+			 - getWindowHeight()) {
 		this.fetchingDisabled = true;
 		this.fetchTail();
 	}
@@ -185,6 +205,9 @@ Lightbox.prototype.onResponseLoad = function(req) {
 			this.fm.submitButton = undefined;
 			this.refreshGrid();
 			break;
+		default :
+			this.fm.loadResponse(req);
+			break;
 	}
 };
 
@@ -247,7 +270,7 @@ Lightbox.prototype.deleteSelection = function() {
 };
 
 Lightbox.prototype._removeSelection = function() {
-	var i, e, slide;
+	var i, e;
 	var toRemove = [];
 	for (i=0 ; i<this.form.elements.length ; i++) {
 		e = this.form.elements[i];
@@ -256,10 +279,11 @@ Lightbox.prototype._removeSelection = function() {
 		}
 	}
 	for (i=0 ; i<toRemove.length ; i++) {
-		slide = toRemove[i];
-		slide.parentNode.removeChild(slide);
+		this.grid.removeChild(toRemove[i]);
 	}
+	this._buildSlidesIndex();
 	this.cbIndex = undefined;
+	this.windowScrollGridHandler();
 };
 
 Lightbox.prototype.getCBIndex = function(cb) {
@@ -267,14 +291,11 @@ Lightbox.prototype.getCBIndex = function(cb) {
 		// build checkbox index
 		this.cbIndex = [];
 		var i, node, c;
-		var nodes = this.grid.childNodes;
-		for (i=0 ; i<nodes.length ; i++) {
-			node = nodes[i];
-			if (node.nodeName === 'SPAN') {
-				c = node.getElementsByTagName('input')[0];
-				c.index = this.cbIndex.length;
-				this.cbIndex[this.cbIndex.length] = c;
-			}
+		for (i=0 ; i<this.slides.length ; i++) {
+			node = this.slides[i];
+			c = node.getElementsByTagName('input')[0];
+			c.index = this.cbIndex.length;
+			this.cbIndex.push(c);
 		}
 	}
 	return cb.index;
@@ -313,7 +334,7 @@ Lightbox.prototype.refreshGrid = function() {
 			case 4 :
 				hideProgressImage();
 				if (req.status === 200) {
-					self._refreshGrid(req)
+					self._refreshGrid(req);
 				}
 				break;
 		}
@@ -321,23 +342,31 @@ Lightbox.prototype.refreshGrid = function() {
 	
 	var url = absolute_url() +
 			  '/portfolio_thumbnails_tail?start:int=0&size:int=' +
-			  this.grid.children.length;
+			  this.slides.length;
 	req.open('GET', url, true);
 	req.send();
 };
 
 Lightbox.prototype._refreshGrid = function(req) {
 	var doc = req.responseXML.documentElement;
-	var i;
-	var slides = this.grid.children;
-	for (i=0 ; i<doc.children.length ; i++) {
-		this.grid.replaceChild(getCopyOfNode(doc.children[i]), slides[i]);
+	var i, node;
+	var j = 0;
+	for (i=0 ; i<doc.childNodes.length ; i++) {
+		node = doc.childNodes[i];
+		if (node.nodeType === 1) {
+			node = getCopyOfNode(node);
+			this.disableDefaultDragging(node);
+			this.grid.replaceChild(node, this.slides[j]);
+			this.slides[j] = node;
+			j++;
+		}
 	}
+	this.cbIndex = undefined;
 };
 
 Lightbox.prototype.fetchTail = function() {
 	var req = new XMLHttpRequest();
-	self = this;
+	var self = this;
 	req.onreadystatechange = function() {
 		switch (req.readyState) {
 			case 1 :
@@ -346,7 +375,7 @@ Lightbox.prototype.fetchTail = function() {
 			case 4 :
 				hideProgressImage();
 				if (req.status === 200) {
-					self._appendTail(req)
+					self._appendTail(req);
 				}
 				break;
 		}
@@ -354,23 +383,34 @@ Lightbox.prototype.fetchTail = function() {
 	
 	var url = absolute_url() +
 			  '/portfolio_thumbnails_tail?start:int=' +
-			  String(this.grid.children.length + 1 ) +
-			  '&size:int=10';
+			  String(this.slides.length) +
+			  '&size:int=10' +
+			  '&container_type=' +
+			  this.container_type;
 	req.open('GET', url, true);
 	req.send();
 };
 
 Lightbox.prototype._appendTail = function(req) {
 	var doc = req.responseXML.documentElement;
-	var i;
-	var slides = this.grid.children;
-	for (i=0 ; i<doc.children.length ; i++) {
-		this.lastSlide = this.grid.appendChild(getCopyOfNode(doc.children[i]));
+	var i, node, c;
+	for (i=0 ; i<doc.childNodes.length ; i++) {
+		node = doc.childNodes[i];
+		if (node.nodeType === 1) {
+			this.lastSlide = this.grid.appendChild(getCopyOfNode(node));
+			this.disableDefaultDragging(this.lastSlide);
+			this.slides.push(this.lastSlide);
+			if (this.cbIndex) {
+				c = this.lastSlide.getElementsByTagName('input')[0];
+				c.index = this.cbIndex.length;
+				this.cbIndex.push(c);
+				
+			}
+		}
 	}
 	this.fetchingDisabled = false;
 	if (doc.getAttribute('nomore')) {
 		this.complete = true;
-		console.info('complete');
 	}
 	this.windowScrollGridHandler();
 };
@@ -391,4 +431,84 @@ else {
 	};
 }
 
+if (browser.isGecko) {
+	Lightbox.prototype.disableDefaultDragging = function(element) {
+		if (!element) {
+			element = this.grid;
+		}
+		var i, j, name, elements;
+		var elementsNames = ['a', 'img'];
+		for (i=0 ; i < elementsNames.length ; i++) {
+			name = elementsNames[i];
+			elements = element.getElementsByTagName(name);
+			for (j=0 ; j < elements.length ; j++) {
+				elements[j].draggable=false;
+			}
+		}
+	};
+}
+else {
+	Lightbox.prototype.disableDefaultDragging = function() {};
+}
+
+Lightbox.prototype.getSelectedSlides = function() {
+	var i, e, slide;
+	var slides = [];
+	for (i=0 ; i<this.form.elements.length ; i++) {
+		e = this.form.elements[i];
+		if (e.type === 'checkbox' && e.checked) {
+			slide = e.parentNode.parentNode;
+			slides.push(slide);
+		}
+	}
+	return slides;
+};
+
+Lightbox.prototype.onDragStart = function(evt) {
+	var target = getTargetedObject(evt);
+	this.dragged = target;
+	this.draggedSelection = this.getSelectedSlides();
+	if (this.draggedSelection.indexOf(target) === -1) {
+		this.draggedSelection.push(target);
+	}
+	evt.dataTransfer.setData('text', '');
+	var i, slide;
+	for(i=0 ; i<this.draggedSelection.length ; i++) {
+		slide = this.draggedSelection[i];
+		slide.style.opacity = 0;
+		slide.style.width = 0;
+	}
+};
+
+Lightbox.prototype.onDragOver = function(evt) {
+	var target = getTargetedObject(evt);
+	if (!target) {return;}
+	while(target.className !== 'slide') {
+		target = target.parentNode;
+	}
+	target = target.parentNode;
+	if (target !== this.dragged) {
+		target.classList.add('dragover');
+	}
+	if (this.previousDragOver && this.previousDragOver !== target) {
+		this.previousDragOver.classList.remove('dragover');
+	}
+	this.previousDragOver = target;
+};
+
+Lightbox.prototype.onDragEnd = function(evt) {
+	if (this.previousDragOver) {
+		this.previousDragOver.classList.remove('dragover');
+		var i, slide;
+		for(i=this.draggedSelection.length -1 ; i>=0 ; i--) {
+			console.log(i);
+			slide = this.draggedSelection[i].cloneNode(true);
+			this.grid.insertBefore(slide, this.previousDragOver.nextSibling);
+			slide.style.opacity = 1;
+			slide.style.width = '';
+		}
+	}
+	this.draggedSelection = this.previousDragOver = this.dragged = undefined;
+};
+
 }());
\ No newline at end of file