Skip to content

Added option 'skip_duplicates' #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcguffin wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added option 'skip_duplicates' #129

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d1a57c
add option 'skip_duplicates'
mcguffin Aug 21, 2013
0184d6c
fix image counter.
mcguffin Sep 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion js/jquery.prettyPhoto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
changepicturecallback: function(){}, /* Called everytime an item is shown/changed */
callback: function(){}, /* Called when prettyPhoto is closed */
ie6_fallback: true,
skip_duplicates:true,
markup: '<div class="pp_pic_holder"> \
<div class="ppt">&nbsp;</div> \
<div class="pp_top"> \
Expand Down Expand Up @@ -188,6 +189,10 @@
_build_overlay(event.target); // Build the overlay {this} being the caller
}

// make array unique
if ( settings.skip_duplicates )
pp_images = $.grep(pp_images, function(v, k) { return $.inArray(v ,pp_images) === k; });

if(settings.hideflash) $('object,embed,iframe[src*=youtube],iframe[src*=vimeo]').css('visibility','hidden'); // Hide the flash

_checkPosition($(pp_images).size()); // Hide the next/previous links if on first or last images.
Expand Down Expand Up @@ -759,6 +764,9 @@
if(isSet && settings.overlay_gallery) {
currentGalleryPage = 0;
toInject = "";
if ( settings.skip_duplicates ) {
var image_sources = [];
}
for (var i=0; i < pp_images.length; i++) {
if(!pp_images[i].match(/\b(jpg|jpeg|png|gif)\b/gi)){
classname = 'default';
Expand All @@ -767,7 +775,12 @@
classname = '';
img_src = pp_images[i];
}
toInject += "<li class='"+classname+"'><a href='#'><img src='" + img_src + "' width='50' alt='' /></a></li>";
if ( !settings.skip_duplicates || image_sources.indexOf(img_src) == -1 ) {
toInject += "<li class='"+classname+"'><a href='#'><img src='" + img_src + "' width='50' alt='' /></a></li>";
if ( settings.skip_duplicates ) {
image_sources.push(img_src);
}
}
};

toInject = settings.gallery_markup.replace(/{gallery}/g,toInject);
Expand Down