factorisation

[Portfolio.git] / skins / photo_lightbox_viewer.js

diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index c030fbb..8dfbaf4 100644 (file)
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -11,19 +11,21 @@ var Lightbox;
 
 var reSelected = /.*selected.*/;
 
 
 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;
        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);});
        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;
        this.lastCBChecked = undefined;
        this.form = undefined;
        var parent = this.grid.parentNode;


@@ -59,12 +61,12 @@ Lightbox.prototype._buildSlidesIndex = function() {
 };
 
 Lightbox.prototype.windowScrollToolbarlHandler = function(evt) {
 };
 
 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);
        }
                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);
        }
                this.toolbarFixed = false;
                this.switchToolBarPositioning(false);
        }


@@ -72,7 +74,9 @@ Lightbox.prototype.windowScrollToolbarlHandler = function(evt) {
 Lightbox.prototype.windowScrollGridHandler = function(evt) {
        if (!this.complete &&
                !this.fetchingDisabled &&
 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();
        }
                this.fetchingDisabled = true;
                this.fetchTail();
        }


@@ -322,7 +326,7 @@ Lightbox.prototype.refreshGrid = function() {
                        case 4 :
                                hideProgressImage();
                                if (req.status === 200) {
                        case 4 :
                                hideProgressImage();
                                if (req.status === 200) {

-                                       self._refreshGrid(req)
+                                       self._refreshGrid(req);

                                }
                                break;
                }
                                }
                                break;
                }


@@ -353,7 +357,7 @@ Lightbox.prototype._refreshGrid = function(req) {
 
 Lightbox.prototype.fetchTail = function() {
        var req = new XMLHttpRequest();
 
 Lightbox.prototype.fetchTail = function() {
        var req = new XMLHttpRequest();

-       self = this;
+       var self = this;

        req.onreadystatechange = function() {
                switch (req.readyState) {
                        case 1 :
        req.onreadystatechange = function() {
                switch (req.readyState) {
                        case 1 :


@@ -362,7 +366,7 @@ Lightbox.prototype.fetchTail = function() {
                        case 4 :
                                hideProgressImage();
                                if (req.status === 200) {
                        case 4 :
                                hideProgressImage();
                                if (req.status === 200) {

-                                       self._appendTail(req)
+                                       self._appendTail(req);

                                }
                                break;
                }
                                }
                                break;
                }


@@ -370,8 +374,10 @@ Lightbox.prototype.fetchTail = function() {
        
        var url = absolute_url() +
                          '/portfolio_thumbnails_tail?start:int=' +
        
        var url = absolute_url() +
                          '/portfolio_thumbnails_tail?start:int=' +

-                         String(this.slides.length + 1 ) +
-                         '&size:int=10';
+                         String(this.slides.length) +
+                         '&size:int=10' +
+                         '&container_type=' +
+                         this.container_type;

        req.open('GET', url, true);
        req.send();
 };
        req.open('GET', url, true);
        req.send();
 };