X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/20d32cad15428a0a8d893a8e248d925b004df2c8..bf33c9ca85d7668e07e0a98d7af0be131d665b31:/skins/photo_lightbox_viewer.js

diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index 97c7f79..ba3ecf1 100644
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -11,7 +11,7 @@ var Lightbox;
 
 var reSelected = /.*selected.*/;
 
-Lightbox = function(grid, toolbar, complete, container_type) {
+Lightbox = function(grid, toolbar, complete, container_type, orderable) {
 	var self = this;
 	this.grid = grid;
 	this._buildSlidesIndex(); // set this.slides and this.lastSlide;
@@ -48,9 +48,11 @@ Lightbox = function(grid, toolbar, complete, container_type) {
 
 	// 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);});
+	this._DDOrderingListeners = {'dragstart' : function(evt){self.onDragStart(evt);},
+								 'dragover' : function(evt){self.onDragOver(evt);},
+								 'dragend' : function(evt){self.onDragEnd(evt);}
+								 };
+	if(orderable) {this.enableDDOrdering();}
 };
 
 Lightbox.prototype._buildSlidesIndex = function() {
@@ -76,6 +78,7 @@ Lightbox.prototype.windowScrollToolbarlHandler = function(evt) {
 		this.switchToolBarPositioning(false);
 	}
 };
+
 Lightbox.prototype.windowScrollGridHandler = function(evt) {
 	if (!this.complete &&
 		!this.fetchingDisabled &&
@@ -180,6 +183,8 @@ Lightbox.prototype.mouseClickHandler = function(evt) {
 Lightbox.prototype.onChangeHandler = function(evt) {
 	var target = getTargetedObject(evt);
 	if (target.name === 'sort_on') {
+		if (target.value === 'position') {this.enableDDOrdering();}
+		else {this.disableDDOrdering();}
 		this.fm.submitButton = {'name' : 'set_sorting', 'value' : 'ok'};
 		this.fm.submit(evt);
 	}
@@ -464,6 +469,19 @@ Lightbox.prototype.getSelectedSlides = function() {
 	return slides;
 };
 
+
+Lightbox.prototype.enableDDOrdering = function() {
+	addListener(this.grid, 'dragstart', this._DDOrderingListeners.dragstart);
+	addListener(this.grid, 'dragover', this._DDOrderingListeners.dragover);
+	addListener(this.grid, 'dragend', this._DDOrderingListeners.dragend);
+};
+
+Lightbox.prototype.disableDDOrdering = function() {
+	removeListener(this.grid, 'dragstart', this._DDOrderingListeners.dragstart);
+	removeListener(this.grid, 'dragover', this._DDOrderingListeners.dragover);
+	removeListener(this.grid, 'dragend', this._DDOrderingListeners.dragend);
+};
+
 Lightbox.prototype.onDragStart = function(evt) {
 	var target = getTargetedObject(evt);
 	this.dragged = target;
@@ -481,11 +499,14 @@ Lightbox.prototype.onDragStart = function(evt) {
 };
 
 Lightbox.prototype.onDragOver = function(evt) {
+	if (!this.dragged) {
+		return;
+	}
 	var target = getTargetedObject(evt);
-	if (!target) {return;}
-	while(target.className !== 'slide') {
+	while(target && target.className !== 'slide') {
 		target = target.parentNode;
 	}
+	if (!target) {return;}
 	target = target.parentNode;
 	if (target !== this.dragged) {
 		target.classList.add('dragover');
@@ -524,21 +545,21 @@ Lightbox.prototype.moveSelectedPhotos = function() {
 				break;
 			case 4 :
 				hideProgressImage();
-				self._moveSelectedPhotos(req)
+				self._moveSelectedPhotos(req);
 				break;
 		}
 	};
 	
 	var url = absolute_url() + '/portfolio_move_photos';
-  	req.open("POST", url, true);
-  	req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+	req.open("POST", url, true);
+	req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
 	var query = 'container_type=' + this.container_type;
 	var i;
 	for (i=0 ; i<this.draggedSelection.length ; i++) {
 		query += '&uids:list=' + this.draggedSelection[i].getAttribute('name');
 	}
 	query += '&afterUid=' + this.lastDropTarget.getAttribute('name');
-  	req.send(query);
+	req.send(query);
 };
 
 Lightbox.prototype._moveSelectedPhotos = function(req) {
@@ -549,7 +570,7 @@ Lightbox.prototype._moveSelectedPhotos = function(req) {
 			for(i=0 ; i<this.draggedSelection.length ; i++) {
 				slide = this.draggedSelection[i];
 				this.grid.removeChild(slide);
-				cb = this.pendingMovedSlides[i].getElementsByTagName('input')[0]
+				cb = this.pendingMovedSlides[i].getElementsByTagName('input')[0];
 				cb.checked = false;
 				cb.removeAttribute('checked');
 			}