X-Git-Url: https://svn.cri.ensmp.fr/git/Portfolio.git/blobdiff_plain/d2c54b79af112bf32ae357779b1dca0d148e7eb6..c6109e6db4a3f1f8d0a79a324f56a9f0281522bc:/skins/photo_lightbox_viewer.js?ds=sidebyside diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js index 5244a68..bb27a67 100644 --- a/skins/photo_lightbox_viewer.js +++ b/skins/photo_lightbox_viewer.js @@ -11,14 +11,21 @@ var Lightbox; var reSelected = /.*selected.*/; -Lightbox = function(grid, toolbar) { +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.windowScrollHandler(evt);}); + 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; @@ -35,29 +42,51 @@ Lightbox = function(grid, toolbar) { addListener(this.grid, 'click', function(evt){self.mouseClickHandler(evt);}); if (this.form) { var fm = this.fm = new FormManager(this.form); - addListener(this.form, 'change', function(evt){self.onChangeHandler(evt);}); + addListener(this.form, 'change', function(evt){self.onChangeHandler(evt);}); fm.onBeforeSubmit = function(fm_, evt) {return self.onBeforeSubmit(fm_, evt);}; fm.onResponseLoad = function(req) {return self.onResponseLoad(req);}; } }; -Lightbox.prototype.windowScrollHandler = function(evt) { - if (this.toolbar.offsetTop < window.scrollY && !this.toolbarFixed) { +Lightbox.prototype._buildSlidesIndex = function() { + this.slides = []; + var node, i; + for (i=0 ; i + (this.lastSlide.firstElementChild || this.lastSlide.children[0]).offsetTop + - getWindowHeight()) { + this.fetchingDisabled = true; + this.fetchTail(); + } +}; Lightbox.prototype.mouseClickHandler = function(evt) { var target = getTargetedObject(evt); if (target.tagName === 'IMG') { var img = target; - var link = target.parentNode; + var link = target.parentNode; var button = link.parentNode; var slide = button.parentNode; var req, url; @@ -144,11 +173,11 @@ Lightbox.prototype.mouseClickHandler = function(evt) { }; Lightbox.prototype.onChangeHandler = function(evt) { - var target = getTargetedObject(evt); - if (target.name === 'sort_on') { - this.fm.submitButton = {'name' : 'set_sorting', 'value' : 'ok'}; - this.fm.submit(evt); - } + var target = getTargetedObject(evt); + if (target.name === 'sort_on') { + this.fm.submitButton = {'name' : 'set_sorting', 'value' : 'ok'}; + this.fm.submit(evt); + } }; Lightbox.prototype.onBeforeSubmit = function(fm, evt) { @@ -167,10 +196,13 @@ Lightbox.prototype.onResponseLoad = function(req) { case 'error' : this.showSelection(); break; - case 'sorted' : - this.fm.submitButton = undefined; - this.refreshGrid(); - break; + case 'sorted' : + this.fm.submitButton = undefined; + this.refreshGrid(); + break; + default : + this.fm.loadResponse(req); + break; } }; @@ -233,7 +265,7 @@ Lightbox.prototype.deleteSelection = function() { }; Lightbox.prototype._removeSelection = function() { - var i, e, slide; + var i, e; var toRemove = []; for (i=0 ; i