projects / Portfolio.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
bugfix.
[Portfolio.git] / skins / photo_film_viewer.js
diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index efda660..0a1cab9 100644 (file)
--- a/skins/photo_film_viewer.js
+++ b/skins/photo_film_viewer.js
@@ -1,9 +1,7 @@
 /*
 /*
-* © 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/
-* 
-* 
+copyright 2008-2014 Benoit Pin - Centre de recherche en informatique - MINES ParisTech
+http://plinn.org
+Licence Creative Commons http://creativecommons.org/licenses/by-nc/2.0/
 */
 
 var FilmSlider;
 */
 
 var FilmSlider;
@@ -19,6 +17,7 @@ var DEFAULT_IMAGE_SIZES = [500, 600, 800];
 FilmSlider = function(filmBar, slider, ctxInfos, image, toolbar, breadcrumbs) {
        var thisSlider = this;
        this.filmBar = filmBar;
 FilmSlider = function(filmBar, slider, ctxInfos, image, toolbar, breadcrumbs) {
        var thisSlider = this;
        this.filmBar = filmBar;
+       this.filmBarWidth = getObjectWidth(this.filmBar);
        var film = filmBar.firstChild;
        if (film.nodeType === 3) { film = film.nextSibling; }
        this.film = film;
        var film = filmBar.firstChild;
        if (film.nodeType === 3) { film = film.nextSibling; }
        this.film = film;
@@ -74,42 +73,89 @@ FilmSlider = function(filmBar, slider, ctxInfos, image, toolbar, breadcrumbs) {
                                           'out' :      function(evt){thisSlider.mouseOutHandler(evt);}
                                          };
 
                                           'out' :      function(evt){thisSlider.mouseOutHandler(evt);}
                                          };
 
-       this.resizeSlider();
+       if (browser.isMobile) {
+               this.rail.className = 'hidden';
+       }
+       else { 
+               this.resizeSlider();
+       }
        this.addEventListeners();
 };
 
        this.addEventListeners();
 };
 
-
-FilmSlider.prototype.resizeSlider = function(evt) {
-       var filmBarWidth = getObjectWidth(this.filmBar);
-       if (!filmBarWidth) {
-               var thisSlider = this;
-               addListener(window, 'load', function(evt){thisSlider.resizeSlider(evt);});
-               return;
-       }
+if (!browser.isMobile) {
+       FilmSlider.prototype.resizeSlider = function(evt) {
+               var filmBarWidth = this.filmBarWidth;
+               if (!filmBarWidth) { return; }
+               var filmWidth = this.slideSize * this.filmLength;
+               var sliderRatio = this.sliderRatio =  filmBarWidth / filmWidth;
+               var sliderWidth = filmBarWidth * sliderRatio;
+               this.rail.style.width = filmBarWidth + 'px';
+               this.rail.style.display = 'block';
+               this.rail.style.visibility = 'visible';
+               if (sliderRatio < 1) {
+                       this.slider.style.width = Math.round(sliderWidth) + 'px';
+                       this.slider.style.visibility = 'visible';
+               }
+               else {
+                       this.slider.style.visibility = 'hidden';
+               }
        
        
-       var filmWidth = this.slideSize * this.filmLength;
-       var sliderRatio = this.sliderRatio =  filmBarWidth / filmWidth;
-       var sliderWidth = filmBarWidth * sliderRatio;
-       this.rail.style.width = filmBarWidth + 'px';
-       this.rail.style.display = 'block';
-       this.rail.style.visibility = 'visible';
-       if (sliderRatio < 1) {
-               this.slider.style.width = Math.round(sliderWidth) + 'px';
-               this.slider.style.visibility = 'visible';
-       }
-       else {
-               this.slider.style.visibility = 'hidden';
+               this.winSize = {'width'  : getWindowWidth(),
+                                               'height' : getWindowHeight()};
+               this.maxRightPosition = filmBarWidth - sliderWidth;
+               this.sliderSpeedRatio = - (filmBarWidth - sliderWidth) / (filmWidth - filmBarWidth);
+               if (!this.initialized) {
+                       this.centerSlide(this.center);
+                       this.selectedSlide = this.filmBar.getElementsByTagName('img')[this.center].parentNode;
+                       this.initialized = true;
+               }
+       };
+}
+
+else {
+       // pas de barre de scroll horizontal pour les tablettes
+       FilmSlider.prototype.resizeSlider = function(evt) {
+               this.filmMaxX = - (getObjectWidth(this.film) - this.filmBarWidth);
+               if (!this.initialized) {
+                       this.centerSlide(this.center);
+                       this.selectedSlide = this.filmBar.getElementsByTagName('img')[this.center].parentNode;
+                       this.initialized = true;
+               }
+       };
+}
+
+FilmSlider.prototype._checkSizeAfterLoad = function(evt) {
+       this._barSizes = [];
+       this.filmBarWidth = this._barSizes[this._barSizes.length] = getObjectWidth(this.filmBar);
+       this.resizeSlider();
+       var self = this;
+       this._checkSizeIntervalId = setInterval(function(evt){self._checkSize(evt);}, 25);
+       setTimeout(function(evt){self._checkSizeStability();}, 250);
+};
+
+FilmSlider.prototype._checkSize = function(evt) {
+       this._barSizes[this._barSizes.length] = getObjectWidth(this.filmBar);
+       if (this._barSizes.length >= 2 &&
+               this._barSizes[this._barSizes.length-2] !== this._barSizes[this._barSizes.length-1]) {
+               this.filmBarWidth = this._barSizes[this._barSizes.length-1];
+               this.initialized = false;
+               this.resizeSlider();
        }
        }
-       
-       this.winSize = {'width'  : getWindowWidth(),
-                                       'height' : getWindowHeight()};
-       this.maxRightPosition = filmBarWidth - sliderWidth;
-       this.sliderSpeedRatio = - (filmBarWidth - sliderWidth) / (filmWidth - filmBarWidth);
-       if (!this.initialized) {
-               this.centerSlide(this.center);
-               this.selectedSlide = this.filmBar.getElementsByTagName('img')[this.center].parentNode;
-               this.initialized = true;
+};
+
+FilmSlider.prototype._checkSizeStability = function(evt) {
+       var self = this;
+       var i;
+       for (i=0 ; i<this._barSizes.length - 1 ; i++) {
+               if (this._barSizes[i] !== this._barSizes[i+1]) {
+                       this._barSizes = [];
+                       setTimeout(function(evt){self._checkSizeStability();}, 250);
+                       return;
+               }
        }
        }
+       clearInterval(this._checkSizeIntervalId);
+       delete this._barSizes;
+       delete this._checkSizeIntervalId;
 };
 
 FilmSlider.prototype.fitToScreen = function(evt) {
 };
 
 FilmSlider.prototype.fitToScreen = function(evt) {
@@ -120,7 +166,12 @@ FilmSlider.prototype.fitToScreen = function(evt) {
 
 FilmSlider.prototype._fitToScreen = function(evt) {
        var wh = getWindowHeight();
 
 FilmSlider.prototype._fitToScreen = function(evt) {
        var wh = getWindowHeight();
-       var rb = getObjectTop(this.rail) + getObjectHeight(this.rail); // rail bottom
+       if (!browser.isMobile) {
+               var rb = getObjectTop(this.rail) + getObjectHeight(this.rail); // rail bottom
+       }
+       else {
+               var rb = getObjectTop(this.filmBar) + getObjectHeight(this.filmBar); // film bottom
+       }
        var delta = wh - rb;
        var sh = getObjectHeight(this.stretchable);
        var newSize = sh + delta;
        var delta = wh - rb;
        var sh = getObjectHeight(this.stretchable);
        var newSize = sh + delta;
@@ -157,15 +208,25 @@ FilmSlider.prototype.getBestFitSize = function(ratio) {
        return DEFAULT_IMAGE_SIZES[i];
 };
 
        return DEFAULT_IMAGE_SIZES[i];
 };
 
-FilmSlider.prototype.centerSlide = function(slideIndex) {
-       if (this.sliderRatio > 1) { return; }
-       var filmBarWidth = getObjectWidth(this.filmBar);
-       var x = slideIndex * this.slideSize;
-       x = x - (filmBarWidth - this.slideSize) / 2.0;
-       x = x * this.sliderSpeedRatio;
-       var p = new Point( -x, 0 );
-       this.setSliderPosition(p);
-};
+if (!browser.isMobile) {
+       FilmSlider.prototype.centerSlide = function(slideIndex) {
+               if (this.sliderRatio > 1) { return; }
+               var filmBarWidth = getObjectWidth(this.filmBar);
+               var x = slideIndex * this.slideSize;
+               x = x - (filmBarWidth - this.slideSize) / 2.0;
+               x = x * this.sliderSpeedRatio;
+               var p = new Point( -x, 0 );
+               this.setSliderPosition(p);
+       };
+}
+else {
+       FilmSlider.prototype.centerSlide = function(slideIndex) {
+               var filmBarWidth = getObjectWidth(this.filmBar);
+               var x = slideIndex * this.slideSize;
+               x = x - (filmBarWidth - this.slideSize) / 2.0;
+               this.setFilmPosition(-x);
+       };
+}
 
 FilmSlider.prototype.setSliderPosition = function(point) {
        if(point.x < 0) { point.x = 0; }
 
 FilmSlider.prototype.setSliderPosition = function(point) {
        if(point.x < 0) { point.x = 0; }
@@ -174,9 +235,18 @@ FilmSlider.prototype.setSliderPosition = function(point) {
        this.setFilmPosition(point);
 };
 
        this.setFilmPosition(point);
 };
 
-FilmSlider.prototype.setFilmPosition = function(point) {
-       this.film.style.left = point.x / this.sliderSpeedRatio + 'px';
-};
+if (!browser.isMobile) {
+       FilmSlider.prototype.setFilmPosition = function(point) {
+               this.film.style.left = point.x / this.sliderSpeedRatio + 'px';
+       };
+}
+else {
+       FilmSlider.prototype.setFilmPosition = function(x) {
+               x = Math.min(0, x);
+               x = Math.max(this.filmMaxX, x);
+               this.film.style.left = String(x) + 'px';
+       };
+}
 
 FilmSlider.prototype.getSliderPosition = function() {
        var x = parseInt(this.slider.style.left, 10);
 
 FilmSlider.prototype.getSliderPosition = function() {
        var x = parseInt(this.slider.style.left, 10);
@@ -218,6 +288,7 @@ FilmSlider.prototype.addEventListeners = function() {
        addListener(this.filmBar, 'click', function(evt){thisSlider.thumbnailClickHandler(evt);});
        addListener(this.toolbar, 'click', function(evt){thisSlider.toolbarClickHandler(evt);});
        addListener(window, 'load', function(evt){thisSlider.fitToScreen(evt);});
        addListener(this.filmBar, 'click', function(evt){thisSlider.thumbnailClickHandler(evt);});
        addListener(this.toolbar, 'click', function(evt){thisSlider.toolbarClickHandler(evt);});
        addListener(window, 'load', function(evt){thisSlider.fitToScreen(evt);});
+       addListener(window, 'load', function(evt){thisSlider._checkSizeAfterLoad(evt);});
        
        // dd listeners
        addListener(this.slider, 'mousedown', this.ddHandlers.down);
        
        // dd listeners
        addListener(this.slider, 'mousedown', this.ddHandlers.down);
@@ -232,6 +303,11 @@ FilmSlider.prototype.addEventListeners = function() {
        else if (browser.isIE6up) {
                addListener(this.filmBar, 'mousewheel', function(evt){thisSlider.mouseWheelHandler(evt);});
        }
        else if (browser.isIE6up) {
                addListener(this.filmBar, 'mousewheel', function(evt){thisSlider.mouseWheelHandler(evt);});
        }
+       if (browser.isMobile) {
+               this.filmBar.addEventListener('touchstart', function(evt){thisSlider.touchStartHandler(evt);}, false);
+               this.filmBar.addEventListener('touchmove', function(evt){thisSlider.touchMoveHandler(evt);}, false);
+               this.filmBar.addEventListener('touchend', function(evt){thisSlider.touchEndHandler(evt);}, false);
+       }
        
        addListener(document, 'keydown', function(evt){thisSlider.keyDownHandler(evt);});
        addListener(document, 'keypress', function(evt){thisSlider.keyPressHandler(evt);});
        
        addListener(document, 'keydown', function(evt){thisSlider.keyDownHandler(evt);});
        addListener(document, 'keypress', function(evt){thisSlider.keyPressHandler(evt);});
@@ -333,10 +409,10 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
                this.cartSlide.style.visibility='hidden';
                
                
                this.cartSlide.style.visibility='hidden';
                
                
-               var metadataButton = this.buttons['edit_metadata']
+               var metadataButton = this.buttons.edit_metadata;
                if (metadataButton) {
                        var metadataEditLink = metadataButton.parentNode;
                if (metadataButton) {
                        var metadataEditLink = metadataButton.parentNode;
-                       metadataEditLink.href = canonicalImgUrl + '/photo_edit_form'
+                       metadataEditLink.href = canonicalImgUrl + '/photo_edit_form';
                }
                
 
                }
                
 
@@ -359,12 +435,9 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
                                        break;
                                case 4 :
                                        hideProgressImage();
                                        break;
                                case 4 :
                                        hideProgressImage();
-                                       if (req.status === '200') { thisFS.populateViewer(req); }
-                                       // else
-                                       //      //window.location.href = target.href;
-                                       //      console.error(ajaxUrl);
-
-                       };
+                                       if (req.status === 200) { thisFS.populateViewer(req); }
+                                       break;
+                       }
                };
 
                req.open("GET", ajaxUrl, true);
                };
 
                req.open("GET", ajaxUrl, true);
@@ -376,13 +449,14 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
                var newClasses = [];
                var name, i;
 
                var newClasses = [];
                var name, i;
 
-               for (i in classes) {
+               for (i=0 ; i<classes.length ;  i++) {
                        name = classes[i];
                        name = classes[i];
-                       if (name === 'displayed') { continue; }
-                       else { newClasses.push(name); }
+                       if (name !== 'displayed') {
+                               newClasses.push(name);
+                       }
                }
                
                }
                
-               this.selectedSlide.className = newClasses.join(' ')
+               this.selectedSlide.className = newClasses.join(' ');
                
                // hightlight new displayed slide
                this.selectedSlide = target;
                
                // hightlight new displayed slide
                this.selectedSlide = target;
@@ -395,21 +469,22 @@ FilmSlider.prototype.thumbnailClickHandler = function(evt) {
 
 FilmSlider.prototype.toolbarClickHandler = function(evt) {
        var target = getTargetedObject(evt);
 
 FilmSlider.prototype.toolbarClickHandler = function(evt) {
        var target = getTargetedObject(evt);
+       var button, link, url;
        if(target.tagName === 'IMG' && target.getAttribute('name')) {
                switch(target.getAttribute('name')) {
                        case 'previous' :
                                disableDefault(evt);
                                disablePropagation(evt);
        if(target.tagName === 'IMG' && target.getAttribute('name')) {
                switch(target.getAttribute('name')) {
                        case 'previous' :
                                disableDefault(evt);
                                disablePropagation(evt);
-                               var button = target;
-                               var link = button.parentNode;
+                               button = target;
+                               link = button.parentNode;
                                link.blur();
                                this.loadSibling(true);
                                break;
                        case 'next' : 
                                disableDefault(evt);
                                disablePropagation(evt);
                                link.blur();
                                this.loadSibling(true);
                                break;
                        case 'next' : 
                                disableDefault(evt);
                                disablePropagation(evt);
-                               var button = target;
-                               var link = button.parentNode;
+                               button = target;
+                               link = button.parentNode;
                                link.blur();
                                this.loadSibling(false);
                                break;
                                link.blur();
                                this.loadSibling(false);
                                break;
@@ -424,7 +499,7 @@ FilmSlider.prototype.toolbarClickHandler = function(evt) {
                                        return;
                                }
                                var main = document.getElementById('photo_viewer');
                                        return;
                                }
                                var main = document.getElementById('photo_viewer');
-                               var url = target.parentNode.href;
+                               url = target.parentNode.href;
                                url = url.substring(0, url.length - '/zoom_view'.length);
                                var margins = {'top':0, 'right':-1, 'bottom':0, 'left':0};
                                this.mosaique = new Mosaique(main, url, margins);
                                url = url.substring(0, url.length - '/zoom_view'.length);
                                var margins = {'top':0, 'right':-1, 'bottom':0, 'left':0};
                                this.mosaique = new Mosaique(main, url, margins);
@@ -434,12 +509,12 @@ FilmSlider.prototype.toolbarClickHandler = function(evt) {
                        case 'toggle_selection':
                                disableDefault(evt);
                                disablePropagation(evt);
                        case 'toggle_selection':
                                disableDefault(evt);
                                disablePropagation(evt);
-                               var button = target;
-                               var link = button.parentNode;
+                               button = target;
+                               link = button.parentNode;
                                link.blur();
                                
                                var req = new XMLHttpRequest();
                                link.blur();
                                
                                var req = new XMLHttpRequest();
-                               var url = link.href;
+                               url = link.href;
                                req.open("POST", url, true);
                                req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
                                req.send("ajax=1");
                                req.open("POST", url, true);
                                req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
                                req.send("ajax=1");
@@ -469,8 +544,8 @@ FilmSlider.prototype.toolbarClickHandler = function(evt) {
                        case 'show_buyable':
                                disableDefault(evt);
                                disablePropagation(evt);
                        case 'show_buyable':
                                disableDefault(evt);
                                disablePropagation(evt);
-                               var button = target;
-                               var link = button.parentNode;
+                               button = target;
+                               link = button.parentNode;
                                link.blur();
                                var slide = this.cartSlide;
                                slide.innerHTML = '';
                                link.blur();
                                var slide = this.cartSlide;
                                slide.innerHTML = '';
@@ -536,8 +611,54 @@ else if (browser.isIE6up) {
        };
 }
 
        };
 }
 
+FilmSlider.prototype.touchStartHandler = function(evt) {
+       this.filmStartX = parseInt(this.film.style.left, 10);
+       this.touchStartX = evt.changedTouches[0].screenX;
+       this.touchStartTime = (new Date()).getTime();
+};
+
+FilmSlider.prototype.touchMoveHandler = function(evt) {
+       disableDefault(evt);
+       var delta = this.touchStartX - evt.changedTouches[0].screenX;
+       var posX = this.filmStartX - delta;
+       this.setFilmPosition(posX);
+    this.lastMoveTime = (new Date()).getTime();
+};
+
+FilmSlider.prototype.touchEndHandler = function(evt) {
+    var x = evt.changedTouches[0].screenX;
+       var delta = x - this.touchStartX;
+       if (delta) {
+               disableDefault(evt);
+        var now = (new Date()).getTime();
+        if (now - this.lastMoveTime < 100) {
+            // au delà de 100 ms de maintient, on annule l'inertie
+               var speed = delta / (now - this.touchStartTime)
+               var x0 = parseInt(this.film.style.left, 10);
+               var t0 = (new Date()).getTime();
+               var d = 500; // milisecondes
+            var delta = 0;
+            var dt = 25
+               var self = this;
+       
+               function animate() {
+                // inertie
+                       var t = (new Date()).getTime() - t0;
+                       if (t < d) {
+                               setTimeout(animate, dt);
+                               delta = delta + (1-t/d) * speed * dt; // décelleration linéaire
+                               self.setFilmPosition(x0 + delta);
+                       }
+               }
+               animate();
+        }
+       }
+       this.touchStartX = undefined;
+};
+
+
 FilmSlider.prototype.keyDownHandler = function(evt) {
 FilmSlider.prototype.keyDownHandler = function(evt) {
-       var evt = getEventObject(evt);
+       evt = getEventObject(evt);
        switch (evt.keyCode) {
                case keyLeft :
                        this.loadSibling(true);
        switch (evt.keyCode) {
                case keyLeft :
                        this.loadSibling(true);
@@ -554,19 +675,20 @@ FilmSlider.prototype.keyDownHandler = function(evt) {
 FilmSlider.prototype.keyPressHandler = function(evt) {
        var target = getTargetedObject(evt);
        if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA') { return; }
 FilmSlider.prototype.keyPressHandler = function(evt) {
        var target = getTargetedObject(evt);
        if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA') { return; }
-       var evt = getEventObject(evt);
+       evt = getEventObject(evt);
        var charPress = String.fromCharCode((evt.keyCode) ? evt.keyCode : evt.which);
        switch(charPress) {
                case 'f':
                case 'F':
        var charPress = String.fromCharCode((evt.keyCode) ? evt.keyCode : evt.which);
        switch(charPress) {
                case 'f':
                case 'F':
-                       raiseMouseEvent(this.buttons['full_screen'], 'click');
+                       raiseMouseEvent(this.buttons.full_screen, 'click');
                        break;
        }
 };
 
 FilmSlider.prototype.populateViewer = function(req) {
        var elements = req.responseXML.documentElement.childNodes;
                        break;
        }
 };
 
 FilmSlider.prototype.populateViewer = function(req) {
        var elements = req.responseXML.documentElement.childNodes;
-       for(var i=0 ; i < elements.length ; i++ ) {
+       var i;
+       for(i=0 ; i < elements.length ; i++ ) {
                element = elements[i];
                switch (element.nodeName) {
                        case 'fragment' :
                element = elements[i];
                switch (element.nodeName) {
                        case 'fragment' :
@@ -574,14 +696,14 @@ FilmSlider.prototype.populateViewer = function(req) {
                                if (dest) { dest.innerHTML = element.firstChild.nodeValue; }
                                break;
                        case 'imageattributes' :
                                if (dest) { dest.innerHTML = element.firstChild.nodeValue; }
                                break;
                        case 'imageattributes' :
-                               var link = this.buttons['back_to_portfolio'].parentNode;
-                               link.href = element.getAttribute('backToContextUrl');
-                               link = this.buttons['show_buyable'].parentNode;
+                               var link = this.buttons.back_to_portfolio.parentNode;
+                               link.href = element.getAttribute('back_to_context_url');
+                               link = this.buttons.show_buyable.parentNode;
                                var buyable = element.getAttribute('buyable');
                                if(buyable === 'True') { link.className = null; }
                                else if(buyable === 'False') { link.className = 'hidden'; }
                                this.image.alt = element.getAttribute('alt');
                                var buyable = element.getAttribute('buyable');
                                if(buyable === 'True') { link.className = null; }
                                else if(buyable === 'False') { link.className = 'hidden'; }
                                this.image.alt = element.getAttribute('alt');
-                               this.updateBreadcrumbs(element.getAttribute('lastBcUrl'),
+                               this.updateBreadcrumbs(element.getAttribute('last_bc_url'),
                                                                           element.getAttribute('img_id'));
                                break;
                }
                                                                           element.getAttribute('img_id'));
                                break;
                }
@@ -600,8 +722,8 @@ FilmSlider.prototype.refreshImage = function() {
 
 FilmSlider.prototype.updateBreadcrumbs = function(url, title) {
        if (this.hasBreadcrumbs) {
 
 FilmSlider.prototype.updateBreadcrumbs = function(url, title) {
        if (this.hasBreadcrumbs) {
-               this.lastBCElement.href = element.getAttribute('lastBcUrl');
-               this.lastBCElement.innerHTML = element.getAttribute('img_id');
+               this.lastBCElement.href = url;
+               this.lastBCElement.innerHTML = title;
        }
 };
 
        }
 };
 
@@ -622,8 +744,7 @@ FilmSlider.prototype.slideShowNext = function() {
        else {
                var row = this.slideShowSlide.parentNode.parentNode;
                var first = row.firstChild;
        else {
                var row = this.slideShowSlide.parentNode.parentNode;
                var first = row.firstChild;
-               if (first.nodeType===3)
-                       first = first.nextSibling;
+               if (first.nodeType===3) { first = first.nextSibling; }
                this.pendingSlideShowSlide = first.getElementsByTagName('a')[0];
                return this.pendingSlideShowSlide.href;
        }
                this.pendingSlideShowSlide = first.getElementsByTagName('a')[0];
                return this.pendingSlideShowSlide.href;
        }
@@ -653,7 +774,7 @@ FilmSlider.prototype.slideShowImageLoaded = function() {
 
 FilmSlider.prototype.stopSlideShow = function() {
        raiseMouseEvent(this.slideShowSlide, 'click');
 
 FilmSlider.prototype.stopSlideShow = function() {
        raiseMouseEvent(this.slideShowSlide, 'click');
-       var index = parseInt(this.selectedSlide.getAttribute('portfolio:position'));
+       var index = parseInt(this.selectedSlide.getAttribute('portfolio:position'), 10);
        this.centerSlide(index);
 };
 
        this.centerSlide(index);
 };
 
@@ -665,7 +786,7 @@ function Point(x, y) {
 }
 Point.prototype.diff = function(point) { return new Point(this.x - point.x, this.y - point.y); };
 Point.prototype.add = function(point) { return new Point(this.x + point.x, this.y + point.y); };
 }
 Point.prototype.diff = function(point) { return new Point(this.x - point.x, this.y - point.y); };
 Point.prototype.add = function(point) { return new Point(this.x + point.x, this.y + point.y); };
-Point.prototype.mul = function(k) { return new Point(this.x * k, this.y *k)};
+Point.prototype.mul = function(k) { return new Point(this.x * k, this.y *k); };
 Point.prototype.toString = function() { return "(" + String(this.x) + ", " + String(this.y) + ")"; };
 
 Point.prototype.toString = function() { return "(" + String(this.x) + ", " + String(this.y) + ")"; };
 
-})();
+}());
Photo / portfolio product for Plinn