From: Benoît Pin <benoit.pin@gmail.com>
Date: Wed, 27 Jul 2011 17:46:09 +0000 (+0200)
Subject: Prise en charge des boutons dans le diaporama.
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Portfolio.git/commitdiff_plain/f0d912b0c1a0183f8e002934085c4adced6b379f?ds=inline;hp=907f127943c42a1e55b47d62f25d99972adccf1c

Prise en charge des boutons dans le diaporama.
---

diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index 4c21355..b68b664 100644
--- 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 5460ee2..daf722b 100644
--- 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 060c35c..b818398 100644
Binary files a/skins/slide_show.swf and b/skins/slide_show.swf differ