Bugfix : quand on a une présentation sans breadcrumbs, il ne faut pas que ça plante.

[Portfolio.git] / skins / photo_film_viewer.js

diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index b68b664..bda6428 100644 (file)
--- a/skins/photo_film_viewer.js
+++ b/skins/photo_film_viewer.js
@@ -1,5 +1,5 @@
 /*
-* © 2008 Benoît Pin – Centre de recherche en informatique – École des mines de Paris
+* © 2008-2014 Benoît Pin – Centre de recherche en informatique – MINES ParisTech
 * http://plinn.org
 * Licence Creative Commons http://creativecommons.org/licenses/by-nc/2.0/
 * 
@@ -36,10 +36,16 @@ FilmSlider = function(filmBar, slider, ctxInfos, image, toolbar, breadcrumbs) {
        
        this.buttons = new Array();
        this.toolbar = toolbar;
-       var bcElements = breadcrumbs.getElementsByTagName('a');
-       this.lastBCElement = bcElements[bcElements.length-1];
-       var imgSrcParts = image.src.split('/');
-       this.lastBCElement.innerHTML = imgSrcParts[imgSrcParts.length-2];
+       if (breadcrumbs) {
+               var bcElements = breadcrumbs.getElementsByTagName('a');
+               this.lastBCElement = bcElements[bcElements.length-1];
+               var imgSrcParts = image.src.split('/');
+               this.lastBCElement.innerHTML = imgSrcParts[imgSrcParts.length-2];
+               this.hasBreadcrumbs = true;
+       }
+       else {
+               this.hasBreadcrumbs = false;
+       }
        
        var buttons = toolbar.getElementsByTagName('img');
        var b, name;
@@ -94,7 +100,7 @@ FilmSlider.prototype.resizeSlider = function(evt) {
        var sliderWidth = filmBarWidth * sliderRatio;
        this.rail.style.width = filmBarWidth + 'px';
        this.rail.style.display = 'block';
-       this.rail.style.visibility = 'visible';
+       this.rail.style.visibility = 'visible';
        if (sliderRatio < 1) {
                this.slider.style.width = Math.round(sliderWidth) + 'px';
                this.slider.style.visibility = 'visible';
@@ -103,7 +109,7 @@ FilmSlider.prototype.resizeSlider = function(evt) {
                this.slider.style.visibility = 'hidden';
        }
        
-       this.winSize = {'width'  : getWindowWidth(),
+       this.winSize = {'width'  : getWindowWidth(),
                                        'height' : getWindowHeight()};
        this.maxRightPosition = filmBarWidth - sliderWidth
        this.sliderSpeedRatio = - (filmBarWidth - sliderWidth) / (filmWidth - filmBarWidth);
@@ -305,12 +311,13 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
                disableDefault(evt);
                disablePropagation(evt);
                target.blur();
+        history.pushState(target.href, '', target.href);
                
                var imgBaseUrl = target.href;
                var canonicalImgUrl;
                if (this.ctxUrlTranslation[0])
                        canonicalImgUrl = imgBaseUrl.replace(this.ctxUrlTranslation[0],
-                                                                                                this.ctxUrlTranslation[1]);
+                                                                                                this.ctxUrlTranslation[1]);
                else
                        canonicalImgUrl = imgBaseUrl;
                
@@ -571,8 +578,7 @@ FilmSlider.prototype.keyPressHandler = function(evt) {
        var target = getTargetedObject(evt);
        if (target.tagName == 'INPUT' || target.tagName== 'TEXTAREA')
                return;
-       var evt = evt = getEventObject(evt);
-       evt = getEventObject(evt);
+       var evt = getEventObject(evt);
        var charPress = String.fromCharCode((evt.keyCode) ? evt.keyCode : evt.which);
        switch(charPress) {
                case 'f':
@@ -589,7 +595,7 @@ FilmSlider.prototype.populateViewer = function(req) {
                switch (element.nodeName) {
                        case 'fragment' :
                                var dest = document.getElementById(element.getAttribute('id'));
-                               dest.innerHTML = element.firstChild.nodeValue;
+                               if (dest) { dest.innerHTML = element.firstChild.nodeValue; }
                                break;
                        case 'imageattributes' :
                                var link = this.buttons['back_to_portfolio'].parentNode;
@@ -601,8 +607,8 @@ FilmSlider.prototype.populateViewer = function(req) {
                                else if(buyable == 'False')
                                        link.className = 'hidden';
                                this.image.alt = element.getAttribute('alt');
-                               this.lastBCElement.href = element.getAttribute('lastBcUrl');
-                               this.lastBCElement.innerHTML = element.getAttribute('img_id');
+                               this.updateBreadcrumbs(element.getAttribute('lastBcUrl'),
+                                                                          element.getAttribute('img_id'));
                                break;
                }
        }
@@ -620,6 +626,13 @@ FilmSlider.prototype.refreshImage = function() {
                this.image.parentNode.className = '';
 };
 
+FilmSlider.prototype.updateBreadcrumbs = function(url, title) {
+       if (this.hasBreadcrumbs) {
+               this.lastBCElement.href = element.getAttribute('lastBcUrl');
+               this.lastBCElement.innerHTML = element.getAttribute('img_id');
+       }
+};
+
 FilmSlider.prototype.startSlideShow = function() {
        this.slideShowSlide = this.pendingSlideShowSlide = this.selectedSlide;
        return this.slideShowSlide.href;