X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/e0660307a6fa16a363722bcf06f74bb9f53e1d30..605ba00317f24d9e86d7768db0bfa3bce326b00b:/skins/photo_lightbox_viewer.js?ds=inline diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js index cf39a0a..23f6f77 100644 --- a/skins/photo_lightbox_viewer.js +++ b/skins/photo_lightbox_viewer.js @@ -14,25 +14,17 @@ var reSelected = /.*selected.*/; Lightbox = function(grid, toolbar, complete) { var self = this; this.grid = grid; - 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]; + this._buildSlidesIndex(); // set this.slides and this.lastSlide; this.fetchingDisabled = false; this.complete = complete; - console.log('complete:', complete) 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();}); + // addListener(window, 'load', function(evt){ self.windowScrollGridHandler();}); + registerStartupFunction(function(){ self.windowScrollGridHandler();}); this.lastCBChecked = undefined; this.form = undefined; var parent = this.grid.parentNode; @@ -55,13 +47,25 @@ Lightbox = function(grid, toolbar, complete) { } }; +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); } @@ -69,7 +73,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(); } @@ -255,7 +261,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]; @@ -264,10 +270,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) { @@ -275,14 +282,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; @@ -321,7 +325,7 @@ Lightbox.prototype.refreshGrid = function() { case 4 : hideProgressImage(); if (req.status === 200) { - self._refreshGrid(req) + self._refreshGrid(req); } break; } @@ -337,17 +341,22 @@ Lightbox.prototype.refreshGrid = function() { Lightbox.prototype._refreshGrid = function(req) { var doc = req.responseXML.documentElement; var i, node; + var j = 0; for (i=0 ; i<doc.childNodes.length ; i++) { node = doc.childNodes[i]; if (node.nodeType === 1) { - this.slides[i] = this.grid.replaceChild(getCopyOfNode(node), this.slides[i]); + node = getCopyOfNode(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 : @@ -356,7 +365,7 @@ Lightbox.prototype.fetchTail = function() { case 4 : hideProgressImage(); if (req.status === 200) { - self._appendTail(req) + self._appendTail(req); } break; } @@ -372,18 +381,23 @@ Lightbox.prototype.fetchTail = function() { Lightbox.prototype._appendTail = function(req) { var doc = req.responseXML.documentElement; - var i, node; + 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.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(); };