Fetch des photos ok sous FF.

diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 6354b1a26036377f84d8bf5de253e7f874e16bcf..0dccaa0390e5a849268b8602f3909c527b589eaa 100644 (file)
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -104,9 +104,12 @@
       <noscript>
         <div metal:use-macro="here/batch_macros/macros/navigation">batch navigation</div>
       </noscript>
       <noscript>
         <div metal:use-macro="here/batch_macros/macros/navigation">batch navigation</div>
       </noscript>

-      <script type="text/javascript" tal:condition="not:dropable">
-        new Lightbox(document.getElementById('lightbox'),
-                     document.getElementById('lightbox_toolbar'));
+      <script type="text/javascript" tal:condition="not:dropable"
+              tal:content="structure python:'''
+              new Lightbox(document.getElementById('lightbox'),
+                           document.getElementById('lightbox_toolbar'),
+                           %s);
+                           ''' % ('true' if not batch.next else 'false')">

       </script>
       <script type="text/javascript"
               tal:condition="dropable"
       </script>
       <script type="text/javascript"
               tal:condition="dropable"


@@ -114,7 +117,8 @@
               (function(){
                 var lb = document.getElementById('lightbox');
                 new Lightbox(lb,
               (function(){
                 var lb = document.getElementById('lightbox');
                 new Lightbox(lb,

-                             document.getElementById('lightbox_toolbar'));
+                             document.getElementById('lightbox_toolbar'),
+                             %(complete)s);

                 var uploadUrl = '%(putUrl)s';
                 var options = {'slideSize' : %(slideSize)d,
                                'thumbnailSize' : %(thumbnailSize)d};
                 var uploadUrl = '%(putUrl)s';
                 var options = {'slideSize' : %(slideSize)d,
                                'thumbnailSize' : %(thumbnailSize)d};


@@ -122,7 +126,8 @@
               })();
               ''' % {'putUrl' : '%s/put_upload' % here.absolute_url(),
                      'slideSize' : portal_object.slide_size,
               })();
               ''' % {'putUrl' : '%s/put_upload' % here.absolute_url(),
                      'slideSize' : portal_object.slide_size,

-                     'thumbnailSize' : portal_object.thumb_size}">
+                     'thumbnailSize' : portal_object.thumb_size,
+                     'complete': 'true' if not batch.next else 'false'}">

       </script>
     </div>
     <div metal:define-macro="film_bar" tal:omit-tag="">
       </script>
     </div>
     <div metal:define-macro="film_bar" tal:omit-tag="">

diff --git a/skins/photo_lightbox_viewer.js b/skins/photo_lightbox_viewer.js
index 9a57ac21846cf7d47c22e5be62fee6e84506ffb7..d659ac1c149da37ee91d2ffe90fe614c6235da70 100644 (file)
--- a/skins/photo_lightbox_viewer.js
+++ b/skins/photo_lightbox_viewer.js
@@ -11,15 +11,20 @@ var Lightbox;
 
 var reSelected = /.*selected.*/;
 
 
 var reSelected = /.*selected.*/;
 

-Lightbox = function(grid, toolbar) {
+Lightbox = function(grid, toolbar, complete) {

        var self = this;
        this.grid = grid;
        var self = this;
        this.grid = grid;

-    this.lastSlide = this.grid.children[this.grid.children.length-1];
+       this.lastSlide = this.grid.children[this.grid.children.length-1];
+       this.fetchingDisabled = false;
+       this.complete = complete;
+       console.log('complete:', complete)

        this.toolbar = toolbar;
        if (toolbar) {
                this.toolbarFixed = false;
        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();});

        this.lastCBChecked = undefined;
        this.form = undefined;
        var parent = this.grid.parentNode;
        this.lastCBChecked = undefined;
        this.form = undefined;
        var parent = this.grid.parentNode;


@@ -36,13 +41,13 @@ 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.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);};
        }
 };
 
                fm.onBeforeSubmit = function(fm_, evt) {return self.onBeforeSubmit(fm_, evt);};
                fm.onResponseLoad = function(req) {return self.onResponseLoad(req);};
        }
 };
 

-Lightbox.prototype.windowScrollHandler = function(evt) {
+Lightbox.prototype.windowScrollToolbarlHandler = function(evt) {

        if (this.toolbar.offsetTop < window.scrollY && !this.toolbarFixed) {
                this.toolbarFixed = true;
                this.backThreshold = this.toolbar.offsetTop;
        if (this.toolbar.offsetTop < window.scrollY && !this.toolbarFixed) {
                this.toolbarFixed = true;
                this.backThreshold = this.toolbar.offsetTop;


@@ -52,16 +57,21 @@ Lightbox.prototype.windowScrollHandler = function(evt) {
                this.toolbarFixed = false;
                this.switchToolBarPositioning(false);
        }
                this.toolbarFixed = false;
                this.switchToolBarPositioning(false);
        }

-    if (window.scrollY > this.lastSlide.firstElementChild.offsetTop - getWindowHeight()) {
-        this.fetchTail();
-    }
+};
+Lightbox.prototype.windowScrollGridHandler = function(evt) {
+       if (!this.complete &&
+               !this.fetchingDisabled &&
+               window.scrollY > this.lastSlide.firstElementChild.offsetTop - getWindowHeight()) {
+               this.fetchingDisabled = true;
+               this.fetchTail();
+       }

 };
 
 Lightbox.prototype.mouseClickHandler = function(evt) {
        var target = getTargetedObject(evt);
        if (target.tagName === 'IMG') {
                var img = target;
 };
 
 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;
                var button =  link.parentNode;
                var slide = button.parentNode;
                var req, url;


@@ -148,11 +158,11 @@ Lightbox.prototype.mouseClickHandler = function(evt) {
 };
 
 Lightbox.prototype.onChangeHandler = 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) {
 };
 
 Lightbox.prototype.onBeforeSubmit = function(fm, evt) {


@@ -171,10 +181,10 @@ Lightbox.prototype.onResponseLoad = function(req) {
                case 'error' :
                        this.showSelection();
                        break;
                case 'error' :
                        this.showSelection();
                        break;

-        case 'sorted' :
-            this.fm.submitButton = undefined;
-            this.refreshGrid();
-            break;
+               case 'sorted' :
+                       this.fm.submitButton = undefined;
+                       this.refreshGrid();
+                       break;

        }
 };
 
        }
 };
 


@@ -317,12 +327,12 @@ Lightbox.prototype.refreshGrid = function() {
 };
 
 Lightbox.prototype._refreshGrid = function(req) {
 };
 
 Lightbox.prototype._refreshGrid = function(req) {

-    var doc = req.responseXML.documentElement;
-    var i;
-    var slides = this.grid.children;
-    for (i=0 ; i<doc.children.length ; i++) {
-        this.grid.replaceChild(getCopyOfNode(doc.children[i]), slides[i]);
-    }
+       var doc = req.responseXML.documentElement;
+       var i;
+       var slides = this.grid.children;
+       for (i=0 ; i<doc.children.length ; i++) {
+               this.grid.replaceChild(getCopyOfNode(doc.children[i]), slides[i]);
+       }

 };
 
 Lightbox.prototype.fetchTail = function() {
 };
 
 Lightbox.prototype.fetchTail = function() {


@@ -344,19 +354,25 @@ Lightbox.prototype.fetchTail = function() {
        
        var url = absolute_url() +
                          '/portfolio_thumbnails_tail?start:int=' +
        
        var url = absolute_url() +
                          '/portfolio_thumbnails_tail?start:int=' +

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

        req.open('GET', url, true);
        req.send();
 };
 
 Lightbox.prototype._appendTail = function(req) {
        req.open('GET', url, true);
        req.send();
 };
 
 Lightbox.prototype._appendTail = function(req) {

-    var doc = req.responseXML.documentElement;
-    var i;
-    var slides = this.grid.children;
-    for (i=0 ; i<doc.children.length ; i++) {
-        this.grid.replaceChild(getCopyOfNode(doc.children[i]), slides[i]);
-    }
+       var doc = req.responseXML.documentElement;
+       var i;
+       var slides = this.grid.children;
+       for (i=0 ; i<doc.children.length ; i++) {
+               this.lastSlide = this.grid.appendChild(getCopyOfNode(doc.children[i]));
+       }
+       this.fetchingDisabled = false;
+       if (doc.getAttribute('nomore')) {
+               this.complete = true;
+               console.info('complete');
+       }
+       this.windowScrollGridHandler();

 };
 
 
 };
 
 

diff --git a/skins/portfolio_thumbnails_tail_template.pt b/skins/portfolio_thumbnails_tail_template.pt
index eead33193a7a92b15886504d0478cbce7a9aca09..ade9750b5c4226b63d6c37b843583c569a65e4c2 100644 (file)
--- a/skins/portfolio_thumbnails_tail_template.pt
+++ b/skins/portfolio_thumbnails_tail_template.pt
@@ -2,6 +2,7 @@
 <thumbnails tal:define="infos options/infos;
                  slide_size portal_object/slide_size;
                  features options/features"
 <thumbnails tal:define="infos options/infos;
                  slide_size portal_object/slide_size;
                  features options/features"

+     tal:attributes="nomore python:'nomore' if not options['batch'].next else nothing"

      >
   <div metal:use-macro="here/photo_layout_macros/macros/thumbnails">
     thumbnails
      >
   <div metal:use-macro="here/photo_layout_macros/macros/thumbnails">
     thumbnails