bugfix.

[Portfolio.git] / skins / photo_lightbox_viewer.js

diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index e7907ca..3438151 100644 (file)
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -468,9 +468,10 @@ Lightbox.prototype.onDragStart = function(evt) {
        var target = getTargetedObject(evt);
        this.dragged = target;
        this.draggedSelection = this.getSelectedSlides();
-       this.draggedSelection.push(target);
+       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];
@@ -481,30 +482,93 @@ Lightbox.prototype.onDragStart = function(evt) {
 
 Lightbox.prototype.onDragOver = function(evt) {
        var target = getTargetedObject(evt);
-       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');
        }
-       if (this.previousDragOver && this.previousDragOver !== target) {
-               this.previousDragOver.classList.remove('dragover');
+       if (this.lastDropTarget && this.lastDropTarget !== target) {
+               this.lastDropTarget.classList.remove('dragover');
        }
-       this.previousDragOver = target;
+       this.lastDropTarget = target;
 };
 
 Lightbox.prototype.onDragEnd = function(evt) {
-       if (this.previousDragOver) {
-               this.previousDragOver.classList.remove('dragover');
+       if (this.lastDropTarget) {
+               this.lastDropTarget.classList.remove('dragover');
+               var i, slide;
+               this.pendingMovedSlides = [];
+               for(i=this.draggedSelection.length -1 ; i>=0 ; i--) {
+                       slide = this.draggedSelection[i].cloneNode(true);
+                       this.pendingMovedSlides.push(slide);
+                       this.grid.insertBefore(slide, this.lastDropTarget.nextSibling);
+                       slide.style.opacity = 1;
+                       slide.style.width = '';
+               }
+               this.moveSelectedPhotos();
        }
-       var i, slide;
+       // this.draggedSelection = this.lastDropTarget
+       this.dragged = undefined;
+};
+
+Lightbox.prototype.moveSelectedPhotos = function() {
+       var req = new XMLHttpRequest();
+       self = this;
+       req.onreadystatechange = function() {
+               switch (req.readyState) {
+                       case 1 :
+                               showProgressImage();
+                               break;
+                       case 4 :
+                               hideProgressImage();
+                               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");
+       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);
+};
+
+Lightbox.prototype._moveSelectedPhotos = function(req) {
+       var i, slide, cb;
+       if (req.status === 200) {
+               var doc = req.responseXML.documentElement;
+               if (doc.nodeName === 'ok') {
+                       for(i=0 ; i<this.draggedSelection.length ; i++) {
+                               slide = this.draggedSelection[i];
+                               this.grid.removeChild(slide);
+                               cb = this.pendingMovedSlides[i].getElementsByTagName('input')[0]
+                               cb.checked = false;
+                               cb.removeAttribute('checked');
+                       }
+                       this.pendingMovedSlides = undefined;
+                       this.cbIndex = undefined;
+                       return;
+               }
+       }
+       
+       for(i=0 ; i<this.pendingMovedSlides.length ; i++) {
+               slide = this.pendingMovedSlides[i];
+               this.grid.removeChild(slide);
+       }
+       
        for(i=0 ; i<this.draggedSelection.length ; i++) {
                slide = this.draggedSelection[i];
                slide.style.opacity = 1;
                slide.style.width = '';
        }
-       this.draggedSelection = this.previousDragOver = this.dragged = undefined;
 };
 
 }());
\ No newline at end of file