Factorisation / bugfix.

[Portfolio.git] / skins / photo_lightbox_viewer.js

diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index cf39a0a..8dfbaf4 100644 (file)
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -11,28 +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;
        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;
        this.fetchingDisabled = false;
        this.complete = complete;

-       console.log('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;


@@ -55,13 +48,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) {
 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);
        }


@@ -69,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();
        }


@@ -255,7 +262,7 @@ Lightbox.prototype.deleteSelection = function() {
 };
 
 Lightbox.prototype._removeSelection = 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];
        var toRemove = [];
        for (i=0 ; i<this.form.elements.length ; i++) {
                e = this.form.elements[i];


@@ -264,10 +271,11 @@ Lightbox.prototype._removeSelection = function() {
                }
        }
        for (i=0 ; i<toRemove.length ; i++) {
                }
        }
        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.cbIndex = undefined;

+       this.windowScrollGridHandler();

 };
 
 Lightbox.prototype.getCBIndex = function(cb) {
 };
 
 Lightbox.prototype.getCBIndex = function(cb) {


@@ -275,14 +283,11 @@ Lightbox.prototype.getCBIndex = function(cb) {
                // build checkbox index
                this.cbIndex = [];
                var i, node, c;
                // 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;
                }
        }
        return cb.index;


@@ -321,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;
                }


@@ -337,17 +342,22 @@ Lightbox.prototype.refreshGrid = function() {
 Lightbox.prototype._refreshGrid = function(req) {
        var doc = req.responseXML.documentElement;
        var i, node;
 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) {
        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();
 };
 
 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 :


@@ -356,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;
                }


@@ -364,26 +374,33 @@ 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();
 };
 
 Lightbox.prototype._appendTail = function(req) {
        var doc = req.responseXML.documentElement;
        req.open('GET', url, true);
        req.send();
 };
 
 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);
        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;
                }
        }
        this.fetchingDisabled = false;
        if (doc.getAttribute('nomore')) {
                this.complete = true;

-               console.info('complete');

        }
        this.windowScrollGridHandler();
 };
        }
        this.windowScrollGridHandler();
 };