Prise en charge des boutons dans le diaporama.

diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index 4c2135508480282783544f692bb290ba3d28d161..b68b664c7fcc1516637ccce477ff60f3ca6a6cba 100644 (file)
--- a/skins/photo_film_viewer.js
+++ b/skins/photo_film_viewer.js
@@ -621,32 +621,54 @@ FilmSlider.prototype.refreshImage = function() {
 };
 
 FilmSlider.prototype.startSlideShow = function() {
-       this.slideShowSlide = this.selectedSlide;
-       this.nextSlideShowSlide = this.selectedSlide;
+       this.slideShowSlide = this.pendingSlideShowSlide = this.selectedSlide;
        return this.slideShowSlide.href;
 };
 
 FilmSlider.prototype.slideShowNext = function() {
-       this.slideShowSlide = this.nextSlideShowSlide;
        var nextSlide = this.slideShowSlide.parentNode.nextSibling;
        if (nextSlide && nextSlide.nodeType==3)
                nextSlide = nextSlide.nextSibling;      
 
        if (nextSlide) {
                nextSlide = nextSlide.getElementsByTagName('a')[0];
-               this.nextSlideShowSlide = nextSlide;
-               return nextSlide.href;
+               this.pendingSlideShowSlide = nextSlide;
+               return this.pendingSlideShowSlide.href;
        }
        else {
                var row = this.slideShowSlide.parentNode.parentNode;
                var first = row.firstChild;
                if (first.nodeType==3)
                        first = first.nextSibling;
-               this.nextSlideShowSlide = first.getElementsByTagName('a')[0];
-               return this.nextSlideShowSlide.href;
+               this.pendingSlideShowSlide = first.getElementsByTagName('a')[0];
+               return this.pendingSlideShowSlide.href;
        }
 };
 
+FilmSlider.prototype.slideShowPrevious = function() {
+       var previousSlide = this.slideShowSlide.parentNode.previousSibling;
+       if (previousSlide && previousSlide.nodeType==3)
+               previousSlide = previousSlide.previousSibling;
+
+       if (previousSlide) {
+               previousSlide = previousSlide.getElementsByTagName('a')[0];
+               this.pendingSlideShowSlide = previousSlide;
+               return this.pendingSlideShowSlide.href;
+       }
+       else {
+               var row = this.slideShowSlide.parentNode.parentNode;
+               var last = row.lastChild;
+               if (last.nodeType==3)
+                       last = last.previousSibling;
+               this.pendingSlideShowSlide = last.getElementsByTagName('a')[0];
+               return this.pendingSlideShowSlide.href;
+       }
+};
+
+FilmSlider.prototype.slideShowImageLoaded = function() {
+       this.slideShowSlide = this.pendingSlideShowSlide;
+};
+
 FilmSlider.prototype.stopSlideShow = function() {
        raiseMouseEvent(this.slideShowSlide, 'click');
        var index = parseInt(this.selectedSlide.getAttribute('portfolio:position'));

diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 5460ee27b7b3c55e2c06532e5b5de9f60ff858a8..daf722ba27a386ad4f963a1221b9f3a620f5038e 100644 (file)
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -131,8 +131,10 @@
                            document.getElementById('image_toolbar'),
                            document.getElementById('Breadcrumbs'));
             startSlideShow = function() {return fs.startSlideShow();};
-            slideShowNext = function() {return fs.slideShowNext();};
             stopSlideShow = function() {return fs.stopSlideShow();};
+            slideShowPrevious = function() {return fs.slideShowPrevious();};
+            slideShowNext = function() {return fs.slideShowNext();};
+            slideShowImageLoaded = function() {return fs.slideShowImageLoaded();};
           })();
           ''' % {'filmLength': len(contextInfos['infos'])
                 ,'center': index

diff --git a/skins/slide_show.swf b/skins/slide_show.swf
index 060c35c5615122729692a6cf4110b083b038858f..b8183988f409874f2c62f5fadd165c888183f4ee 100644 (file)
Binary files a/skins/slide_show.swf and b/skins/slide_show.swf differ