X-Git-Url: https://scm.cri.minesparis.psl.eu/git/Portfolio.git/blobdiff_plain/9d15a219a1b6910463064c64f9c211c606b4b5eb..fbdbc13c9f32f9df94087780ce90bc0916bde420:/skins/photo_lightbox_viewer.js diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js index 3c69aec..e0f304d 100644 --- a/skins/photo_lightbox_viewer.js +++ b/skins/photo_lightbox_viewer.js @@ -481,11 +481,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,33 +527,36 @@ 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) { - var i, slide; + var i, slide, cb; if (req.status === 200) { var doc = req.responseXML.documentElement; if (doc.nodeName === 'ok') { - this.pendingMovedSlides = undefined; 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; }