X-Git-Url: https://scm.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/701bc8b75afb778fccb487daf948825c3eb2b881..1eeef1dbdd63d9d1f468c00a8b35f4fe11d8c72f:/skins/photo_lightbox_viewer.js diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js index a4c9a25..e7907ca 100644 --- a/skins/photo_lightbox_viewer.js +++ b/skins/photo_lightbox_viewer.js @@ -11,19 +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._buildSlidesIndex(); // set this.slides and this.lastSlide; this.fetchingDisabled = false; this.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; @@ -44,6 +45,12 @@ 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() { @@ -59,12 +66,12 @@ Lightbox.prototype._buildSlidesIndex = function() { }; 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); } @@ -72,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(); } @@ -196,6 +205,9 @@ Lightbox.prototype.onResponseLoad = function(req) { this.fm.submitButton = undefined; this.refreshGrid(); break; + default : + this.fm.loadResponse(req); + break; } }; @@ -322,7 +334,7 @@ Lightbox.prototype.refreshGrid = function() { case 4 : hideProgressImage(); if (req.status === 200) { - self._refreshGrid(req) + self._refreshGrid(req); } break; } @@ -338,10 +350,15 @@ Lightbox.prototype.refreshGrid = function() { Lightbox.prototype._refreshGrid = function(req) { var doc = req.responseXML.documentElement; var i, node; + var j = 0; for (i=0 ; i