diff --git a/script/lightbox.js b/script/lightbox.js index b5e7ad7..96fc12d 100644 --- a/script/lightbox.js +++ b/script/lightbox.js @@ -321,21 +321,6 @@ this.album = []; var imageNumber = 0; - function addToAlbum($link) { - self.album.push({ - alt: $link.attr('data-alt'), - link: $link.attr('href'), - title: $link.attr('data-title') || $link.attr('title') - , orientation: $link.attr('data-orientation') - , type: $link.attr('data-type') - , id: $link.attr('data-id') - , $Media: $link.attr('data-type')=='video'?self.$video:self.$image - , width: $link.find('img').attr('width') - , height: $link.find('img').attr('height') - , set: $link.attr('data-lightbox') || $link.attr('rel') - }); - } - // Support both data-lightbox attribute and rel attribute implementations var dataLightboxValue = $link.attr('data-lightbox'); var $links; @@ -343,7 +328,7 @@ if (dataLightboxValue) { $links = $($link.prop('tagName') + '[data-lightbox="' + dataLightboxValue + '"]'); for (var i = 0; i < $links.length; i = ++i) { - addToAlbum($($links[i])); + this.addToAlbum($($links[i])); if ($links[i] === $link[0]) { imageNumber = i; } @@ -351,12 +336,12 @@ } else { if ($link.attr('rel') === 'lightbox') { // If image is not part of a set - addToAlbum($link); + this.addToAlbum($link); } else { // If image is part of a set $links = $($link.prop('tagName') + '[rel="' + $link.attr('rel') + '"]'); for (var j = 0; j < $links.length; j = ++j) { - addToAlbum($($links[j])); + this.addToAlbum($($links[j])); if ($links[j] === $link[0]) { imageNumber = j; } @@ -374,6 +359,22 @@ this.changeImage(imageNumber); }; + + Lightbox.prototype.addToAlbum = function($link) { + this.album.push({ + alt: $link.attr('data-alt'), + link: $link.attr('href'), + title: $link.attr('data-title') || $link.attr('title'), + + orientation: $link.attr('data-orientation'), + type: $link.attr('data-type'), + id: $link.attr('data-id'), + $Media: $link.attr('data-type')=='video'?this.$video:this.$image, + width: $link.find('img').attr('width'), + height: $link.find('img').attr('height'), + set: $link.attr('data-lightbox') || $link.attr('rel') + }); + } Lightbox.prototype.getMaxSizes = function(iMediaWidth, iMediaHeight, sMediaType) { var iWindowWidth = $(window).width();