From 5f60b4104d4ad34c11cfb920f7f484a7eb5224c2 Mon Sep 17 00:00:00 2001 From: darylteo Date: Thu, 15 Oct 2015 14:33:28 +1100 Subject: [PATCH 1/3] [FIX] #156 Browser complains about mixed content If a site is loaded using https:// youtube videos (and probably other embeds) will not load because the script hard codes http in the video URLs The following fix is as follows: - only applies to video urls (any impact on other embeds unknown) - checks for the current document protocol (http: or https:) - if protocol is file:, then it defaults to http: as is existing behaviour See this fix in action at by clicking the vimeo videos on the right. https://www.listcorp.com/asx/ler --- js/jquery.prettyPhoto.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/jquery.prettyPhoto.js b/js/jquery.prettyPhoto.js index 9ecf9d1..b9b4279 100644 --- a/js/jquery.prettyPhoto.js +++ b/js/jquery.prettyPhoto.js @@ -279,7 +279,8 @@ movie_id = movie_id.substr(0,movie_id.indexOf('&')); // Strip anything after the & } - movie = 'http://www.youtube.com/embed/'+movie_id; + var protocol = document.location.protocol.startsWith('http') ? document.location.protocol : 'http:'; + movie = protocol+'//www.youtube.com/embed/'+movie_id; (getParam('rel',pp_images[set_position])) ? movie+="?rel="+getParam('rel',pp_images[set_position]) : movie+="?rel=1"; if(settings.autoplay) movie += "&autoplay=1"; @@ -293,8 +294,9 @@ movie_id = pp_images[set_position]; var regExp = /http(s?):\/\/(www\.)?vimeo.com\/(\d+)/; var match = movie_id.match(regExp); - - movie = 'http://player.vimeo.com/video/'+ match[3] +'?title=0&byline=0&portrait=0'; + + var protocol = document.location.protocol.startsWith('http') ? document.location.protocol : 'http:'; + movie = protocol+'//player.vimeo.com/video/'+ match[3] +'?title=0&byline=0&portrait=0'; if(settings.autoplay) movie += "&autoplay=1;"; vimeo_width = pp_dimensions['width'] + '/embed/?moog_width='+ pp_dimensions['width']; From 068fa008a7851576dc61334ac9bc8e4c83976350 Mon Sep 17 00:00:00 2001 From: darylteo Date: Mon, 16 Nov 2015 11:45:00 +1100 Subject: [PATCH 2/3] [FIX] startsWith breaks Safari 8 support. --- js/jquery.prettyPhoto.js | 272 +++++++++++++++++++-------------------- 1 file changed, 136 insertions(+), 136 deletions(-) diff --git a/js/jquery.prettyPhoto.js b/js/jquery.prettyPhoto.js index b9b4279..f5976a0 100644 --- a/js/jquery.prettyPhoto.js +++ b/js/jquery.prettyPhoto.js @@ -6,7 +6,7 @@ ------------------------------------------------------------------------- */ (function($) { $.prettyPhoto = {version: '3.1.6'}; - + $.fn.prettyPhoto = function(pp_settings) { pp_settings = jQuery.extend({ hook: 'rel', /* the attribute tag to use for prettyPhoto hooks. default: 'rel'. For HTML5, use "data-rel" or similar. */ @@ -92,24 +92,24 @@ custom_markup: '', social_tools: '' /* html or false to disable */ }, pp_settings); - + // Global variables accessible only by prettyPhoto var matchedObjects = this, percentBased = false, pp_dimensions, pp_open, - + // prettyPhoto container specific pp_contentHeight, pp_contentWidth, pp_containerHeight, pp_containerWidth, - + // Window size windowHeight = $(window).height(), windowWidth = $(window).width(), // Global elements pp_slideshow; - + doresize = true, scroll_pos = _get_scroll(); - + // Window/Keyboard events $(window).unbind('resize.prettyphoto').bind('resize.prettyphoto',function(){ _center_overlay(); _resize_overlay(); }); - + if(pp_settings.keyboard_shortcuts) { $(document).unbind('keydown.prettyphoto').bind('keydown.prettyphoto',function(e){ if(typeof $pp_pic_holder != 'undefined'){ @@ -134,39 +134,39 @@ }; }); }; - + /** * Initialize prettyPhoto. */ $.prettyPhoto.initialize = function() { - + settings = pp_settings; - + if(settings.theme == 'pp_default') settings.horizontal_padding = 16; - + // Find out if the picture is part of a set theRel = $(this).attr(settings.hook); galleryRegExp = /\[(?:.*)\]/; isSet = (galleryRegExp.exec(theRel)) ? true : false; - + // Put the SRCs, TITLEs, ALTs into an array. pp_images = (isSet) ? jQuery.map(matchedObjects, function(n, i){ if($(n).attr(settings.hook).indexOf(theRel) != -1) return $(n).attr('href'); }) : $.makeArray($(this).attr('href')); pp_titles = (isSet) ? jQuery.map(matchedObjects, function(n, i){ if($(n).attr(settings.hook).indexOf(theRel) != -1) return ($(n).find('img').attr('alt')) ? $(n).find('img').attr('alt') : ""; }) : $.makeArray($(this).find('img').attr('alt')); pp_descriptions = (isSet) ? jQuery.map(matchedObjects, function(n, i){ if($(n).attr(settings.hook).indexOf(theRel) != -1) return ($(n).attr('title')) ? $(n).attr('title') : ""; }) : $.makeArray($(this).attr('title')); - + if(pp_images.length > settings.overlay_gallery_max) settings.overlay_gallery = false; - + set_position = jQuery.inArray($(this).attr('href'), pp_images); // Define where in the array the clicked item is positionned rel_index = (isSet) ? set_position : $("a["+settings.hook+"^='"+theRel+"']").index($(this)); - + _build_overlay(this); // Build the overlay {this} being the caller - + if(settings.allow_resize) $(window).bind('scroll.prettyphoto',function(){ _center_overlay(); }); - - + + $.prettyPhoto.open(); - + return false; } @@ -187,22 +187,22 @@ set_position = (arguments[3])? arguments[3]: 0; _build_overlay(event.target); // Build the overlay {this} being the caller } - + 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. - + $('.pp_loaderIcon').show(); - + if(settings.deeplinking) setHashtag(); - + // Rebuild Facebook Like Button with updated href if(settings.social_tools){ - facebook_like_link = settings.social_tools.replace('{location_href}', encodeURIComponent(location.href)); + facebook_like_link = settings.social_tools.replace('{location_href}', encodeURIComponent(location.href)); $pp_pic_holder.find('.pp_social').html(facebook_like_link); } - + // Fade the content in if($ppt.is(':hidden')) $ppt.css('opacity',0).show(); $pp_overlay.show().fadeTo(settings.animation_speed,settings.opacity); @@ -216,24 +216,24 @@ }else{ $pp_pic_holder.find('.pp_description').hide(); } - + // Get the dimensions movie_width = ( parseFloat(getParam('width',pp_images[set_position])) ) ? getParam('width',pp_images[set_position]) : settings.default_width.toString(); movie_height = ( parseFloat(getParam('height',pp_images[set_position])) ) ? getParam('height',pp_images[set_position]) : settings.default_height.toString(); - + // If the size is % based, calculate according to window dimensions percentBased=false; if(movie_height.indexOf('%') != -1) { movie_height = parseFloat(($(window).height() * parseFloat(movie_height) / 100) - 150); percentBased = true; } if(movie_width.indexOf('%') != -1) { movie_width = parseFloat(($(window).width() * parseFloat(movie_width) / 100) - 150); percentBased = true; } - + // Fade the holder $pp_pic_holder.fadeIn(function(){ // Set the title (settings.show_title && pp_titles[set_position] != "" && typeof pp_titles[set_position] != "undefined") ? $ppt.html(unescape(pp_titles[set_position])) : $ppt.html(' '); - + imgPreloader = ""; skipInjection = false; - + // Inject the proper content switch(_getFileType(pp_images[set_position])){ case 'image': @@ -258,16 +258,16 @@ alert('Image cannot be loaded. Make sure the path is correct and image exist.'); $.prettyPhoto.close(); }; - + imgPreloader.src = pp_images[set_position]; break; - + case 'youtube': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport - + // Regular youtube link movie_id = getParam('v',pp_images[set_position]); - + // youtu.be link if(movie_id == ""){ movie_id = pp_images[set_position].split('youtu.be/'); @@ -279,79 +279,79 @@ movie_id = movie_id.substr(0,movie_id.indexOf('&')); // Strip anything after the & } - var protocol = document.location.protocol.startsWith('http') ? document.location.protocol : 'http:'; + var protocol = document.location.protocol.slice(0, 4) === 'http' ? document.location.protocol : 'http:'; movie = protocol+'//www.youtube.com/embed/'+movie_id; (getParam('rel',pp_images[set_position])) ? movie+="?rel="+getParam('rel',pp_images[set_position]) : movie+="?rel=1"; - + if(settings.autoplay) movie += "&autoplay=1"; - + toInject = settings.iframe_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,movie); break; - + case 'vimeo': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport - + movie_id = pp_images[set_position]; var regExp = /http(s?):\/\/(www\.)?vimeo.com\/(\d+)/; var match = movie_id.match(regExp); - - var protocol = document.location.protocol.startsWith('http') ? document.location.protocol : 'http:'; + + var protocol = document.location.protocol.slice(0, 4) === 'http' ? document.location.protocol : 'http:'; movie = protocol+'//player.vimeo.com/video/'+ match[3] +'?title=0&byline=0&portrait=0'; if(settings.autoplay) movie += "&autoplay=1;"; - + vimeo_width = pp_dimensions['width'] + '/embed/?moog_width='+ pp_dimensions['width']; - + toInject = settings.iframe_markup.replace(/{width}/g,vimeo_width).replace(/{height}/g,pp_dimensions['height']).replace(/{path}/g,movie); break; - + case 'quicktime': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport pp_dimensions['height']+=15; pp_dimensions['contentHeight']+=15; pp_dimensions['containerHeight']+=15; // Add space for the control bar - + toInject = settings.quicktime_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,pp_images[set_position]).replace(/{autoplay}/g,settings.autoplay); break; - + case 'flash': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport - + flash_vars = pp_images[set_position]; flash_vars = flash_vars.substring(pp_images[set_position].indexOf('flashvars') + 10,pp_images[set_position].length); filename = pp_images[set_position]; filename = filename.substring(0,filename.indexOf('?')); - + toInject = settings.flash_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,filename+'?'+flash_vars); break; - + case 'iframe': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport - + frame_url = pp_images[set_position]; frame_url = frame_url.substr(0,frame_url.indexOf('iframe')-1); toInject = settings.iframe_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{path}/g,frame_url); break; - + case 'ajax': doresize = false; // Make sure the dimensions are not resized. pp_dimensions = _fitToViewport(movie_width,movie_height); doresize = true; // Reset the dimensions - + skipInjection = true; $.get(pp_images[set_position],function(responseHTML){ toInject = settings.inline_markup.replace(/{content}/g,responseHTML); $pp_pic_holder.find('#pp_full_res')[0].innerHTML = toInject; _showContent(); }); - + break; - + case 'custom': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport - + toInject = settings.custom_markup; break; - + case 'inline': // to get the item height clone it, apply default width, wrap it in the prettyPhoto containers , then delete myClone = $(pp_images[set_position]).clone().append('
').css({'width':settings.default_width}).wrapInner('
').appendTo($('body')).show(); @@ -365,7 +365,7 @@ if(!imgPreloader && !skipInjection){ $pp_pic_holder.find('#pp_full_res')[0].innerHTML = toInject; - + // Show content _showContent(); }; @@ -374,14 +374,14 @@ return false; }; - + /** * Change page in the prettyPhoto modal box * @param direction {String} Direction of the paging, previous or next. */ $.prettyPhoto.changePage = function(direction){ currentGalleryPage = 0; - + if(direction == 'previous') { set_position--; if (set_position < 0) set_position = $(pp_images).size()-1; @@ -391,7 +391,7 @@ }else{ set_position=direction; }; - + rel_index = set_position; if(!doresize) doresize = true; // Allow the resizing of the images @@ -419,7 +419,7 @@ }else{ currentGalleryPage = direction; }; - + slide_speed = (direction == 'next' || direction == 'previous') ? settings.animation_speed : 0; slide_to = currentGalleryPage * (itemsPerPage * itemWidth); @@ -439,7 +439,7 @@ }); pp_slideshow = setInterval($.prettyPhoto.startSlideshow,settings.slideshow); }else{ - $.prettyPhoto.changePage('next'); + $.prettyPhoto.changePage('next'); }; } @@ -462,33 +462,33 @@ */ $.prettyPhoto.close = function(){ if($pp_overlay.is(":animated")) return; - + $.prettyPhoto.stopSlideshow(); - + $pp_pic_holder.stop().find('object,embed').css('visibility','hidden'); - + $('div.pp_pic_holder,div.ppt,.pp_fade').fadeOut(settings.animation_speed,function(){ $(this).remove(); }); - + $pp_overlay.fadeOut(settings.animation_speed, function(){ - + if(settings.hideflash) $('object,embed,iframe[src*=youtube],iframe[src*=vimeo]').css('visibility','visible'); // Show the flash - + $(this).remove(); // No more need for the prettyPhoto markup - + $(window).unbind('scroll.prettyphoto'); - + clearHashtag(); - + settings.callback(); - + doresize = true; - + pp_open = false; - + delete settings; }); }; - + /** * Set the proper sizes on the containers and animate the content in. */ @@ -507,7 +507,7 @@ height:pp_dimensions['contentHeight'], width:pp_dimensions['contentWidth'] },settings.animation_speed); - + // Resize picture the holder $pp_pic_holder.animate({ 'top': projectedTop, @@ -520,7 +520,7 @@ // Show the nav if(isSet && _getFileType(pp_images[set_position])=="image") { $pp_pic_holder.find('.pp_hoverContainer').show(); }else{ $pp_pic_holder.find('.pp_hoverContainer').hide(); } - + if(settings.allow_expand) { if(pp_dimensions['resized']){ // Fade the resizing link if the image is resized $('a.pp_expand,a.pp_contract').show(); @@ -528,18 +528,18 @@ $('a.pp_expand').hide(); } } - + if(settings.autoplay_slideshow && !pp_slideshow && !pp_open) $.prettyPhoto.startSlideshow(); - + settings.changepicturecallback(); // Callback! - + pp_open = true; }); - + _insert_gallery(); pp_settings.ajaxcallback(); }; - + /** * Hide the content...DUH! */ @@ -548,11 +548,11 @@ $pp_pic_holder.find('#pp_full_res object,#pp_full_res embed').css('visibility','hidden'); $pp_pic_holder.find('.pp_fade').fadeOut(settings.animation_speed,function(){ $('.pp_loaderIcon').show(); - + callback(); }); }; - + /** * Check the item position in the gallery array, hide or show the navigation links * @param setCount {integer} The total number of items in the set @@ -560,7 +560,7 @@ function _checkPosition(setCount){ (setCount > 1) ? $('.pp_nav').show() : $('.pp_nav').hide(); // Hide the bottom nav if it's not a set. }; - + /** * Resize the item dimensions if it's bigger than the viewport * @param width {integer} Width of the item to be opened @@ -571,13 +571,13 @@ resized = false; _getDimensions(width,height); - + // Define them in case there's no resize needed imageWidth = width, imageHeight = height; if( ((pp_containerWidth > windowWidth) || (pp_containerHeight > windowHeight)) && doresize && settings.allow_resize && !percentBased) { resized = true, fitting = false; - + while (!fitting){ if((pp_containerWidth > windowWidth)){ imageWidth = (windowWidth - 200); @@ -591,16 +591,16 @@ pp_containerHeight = imageHeight, pp_containerWidth = imageWidth; }; - - + + if((pp_containerWidth > windowWidth) || (pp_containerHeight > windowHeight)){ _fitToViewport(pp_containerWidth,pp_containerHeight) }; - + _getDimensions(imageWidth,imageHeight); }; - + return { width:Math.floor(imageWidth), height:Math.floor(imageHeight), @@ -611,7 +611,7 @@ resized:resized }; }; - + /** * Get the containers dimensions according to the item size * @param width {integer} Width of the item to be opened @@ -620,12 +620,12 @@ function _getDimensions(width,height){ width = parseFloat(width); height = parseFloat(height); - + // Get the details height, to do so, I need to clone it since it's invisible $pp_details = $pp_pic_holder.find('.pp_details'); $pp_details.width(width); detailsHeight = parseFloat($pp_details.css('marginTop')) + parseFloat($pp_details.css('marginBottom')); - + $pp_details = $pp_details.clone().addClass(settings.theme).width(width).appendTo($('body')).css({ 'position':'absolute', 'top':-10000 @@ -633,7 +633,7 @@ detailsHeight += $pp_details.height(); detailsHeight = (detailsHeight <= 34) ? 36 : detailsHeight; // Min-height for the details $pp_details.remove(); - + // Get the titles height, to do so, I need to clone it since it's invisible $pp_title = $pp_pic_holder.find('.ppt'); $pp_title.width(width); @@ -644,20 +644,20 @@ }); titleHeight += $pp_title.height(); $pp_title.remove(); - + // Get the container size, to resize the holder to the right dimensions pp_contentHeight = height + detailsHeight; pp_contentWidth = width; pp_containerHeight = pp_contentHeight + titleHeight + $pp_pic_holder.find('.pp_top').height() + $pp_pic_holder.find('.pp_bottom').height(); pp_containerWidth = width; } - + function _getFileType(itemSrc){ if (itemSrc.match(/youtube\.com\/watch/i) || itemSrc.match(/youtu\.be/i)) { return 'youtube'; }else if (itemSrc.match(/vimeo\.com/i)) { return 'vimeo'; - }else if(itemSrc.match(/\b.mov\b/i)){ + }else if(itemSrc.match(/\b.mov\b/i)){ return 'quicktime'; }else if(itemSrc.match(/\b.swf\b/i)){ return 'flash'; @@ -673,7 +673,7 @@ return 'image'; }; }; - + function _center_overlay(){ if(doresize && typeof $pp_pic_holder != 'undefined') { scroll_pos = _get_scroll(); @@ -681,7 +681,7 @@ projectedTop = (windowHeight/2) + scroll_pos['scrollTop'] - (contentHeight/2); if(projectedTop < 0) projectedTop = 0; - + if(contentHeight > windowHeight) return; @@ -691,7 +691,7 @@ }); }; }; - + function _get_scroll(){ if (self.pageYOffset) { return {scrollTop:self.pageYOffset,scrollLeft:self.pageXOffset}; @@ -701,18 +701,18 @@ return {scrollTop:document.body.scrollTop,scrollLeft:document.body.scrollLeft}; }; }; - + function _resize_overlay() { windowHeight = $(window).height(), windowWidth = $(window).width(); - + if(typeof $pp_overlay != "undefined") $pp_overlay.height($(document).height()).width(windowWidth); }; - + function _insert_gallery(){ if(isSet && settings.overlay_gallery && _getFileType(pp_images[set_position])=="image") { itemWidth = 52+5; // 52 beign the thumb width, 5 being the right margin. navWidth = (settings.theme == "facebook" || settings.theme == "pp_default") ? 50 : 30; // Define the arrow width depending on the theme - + itemsPerPage = Math.floor((pp_dimensions['containerWidth'] - 100 - navWidth) / itemWidth); itemsPerPage = (itemsPerPage < pp_images.length) ? itemsPerPage : pp_images.length; totalPage = Math.ceil(pp_images.length / itemsPerPage) - 1; @@ -727,36 +727,36 @@ galleryWidth = itemsPerPage * itemWidth; fullGalleryWidth = pp_images.length * itemWidth; - + // Set the proper width to the gallery items $pp_gallery .css('margin-left',-((galleryWidth/2) + (navWidth/2))) .find('div:first').width(galleryWidth+5) .find('ul').width(fullGalleryWidth) .find('li.selected').removeClass('selected'); - + goToPage = (Math.floor(set_position/itemsPerPage) < totalPage) ? Math.floor(set_position/itemsPerPage) : totalPage; $.prettyPhoto.changeGalleryPage(goToPage); - + $pp_gallery_li.filter(':eq('+set_position+')').addClass('selected'); }else{ $pp_pic_holder.find('.pp_content').unbind('mouseenter mouseleave'); // $pp_gallery.hide(); } } - + function _build_overlay(caller){ // Inject Social Tool markup into General markup if(settings.social_tools) - facebook_like_link = settings.social_tools.replace('{location_href}', encodeURIComponent(location.href)); + facebook_like_link = settings.social_tools.replace('{location_href}', encodeURIComponent(location.href)); + + settings.markup = settings.markup.replace('{pp_social}',''); - settings.markup = settings.markup.replace('{pp_social}',''); - $('body').append(settings.markup); // Inject the markup - + $pp_pic_holder = $('.pp_pic_holder') , $ppt = $('.ppt'), $pp_overlay = $('div.pp_overlay'); // Set my global selectors - + // Inject the inline gallery! if(isSet && settings.overlay_gallery) { currentGalleryPage = 0; @@ -771,25 +771,25 @@ } toInject += "
    • "; }; - + toInject = settings.gallery_markup.replace(/{gallery}/g,toInject); - + $pp_pic_holder.find('#pp_full_res').after(toInject); - + $pp_gallery = $('.pp_pic_holder .pp_gallery'), $pp_gallery_li = $pp_gallery.find('li'); // Set the gallery selectors - + $pp_gallery.find('.pp_arrow_next').click(function(){ $.prettyPhoto.changeGalleryPage('next'); $.prettyPhoto.stopSlideshow(); return false; }); - + $pp_gallery.find('.pp_arrow_previous').click(function(){ $.prettyPhoto.changeGalleryPage('previous'); $.prettyPhoto.stopSlideshow(); return false; }); - + $pp_pic_holder.find('.pp_content').hover( function(){ $pp_pic_holder.find('.pp_gallery:not(.disabled)').fadeIn(); @@ -809,8 +809,8 @@ }); }); }; - - + + // Inject the play/pause if it's a slideshow if(settings.slideshow){ $pp_pic_holder.find('.pp_nav').prepend('Play') @@ -819,9 +819,9 @@ return false; }); } - + $pp_pic_holder.attr('class','pp_pic_holder ' + settings.theme); // Set the proper theme - + $pp_overlay .css({ 'opacity':0, @@ -845,31 +845,31 @@ $(this).removeClass('pp_contract').addClass('pp_expand'); doresize = true; }; - + _hideContent(function(){ $.prettyPhoto.open(); }); - + return false; }); } - + $pp_pic_holder.find('.pp_previous, .pp_nav .pp_arrow_previous').bind('click',function(){ $.prettyPhoto.changePage('previous'); $.prettyPhoto.stopSlideshow(); return false; }); - + $pp_pic_holder.find('.pp_next, .pp_nav .pp_arrow_next').bind('click',function(){ $.prettyPhoto.changePage('next'); $.prettyPhoto.stopSlideshow(); return false; }); - + _center_overlay(); // Center it }; if(!pp_alreadyInitialized && getHashtag()){ pp_alreadyInitialized = true; - + // Grab the rel index to trigger the click on the correct element hashIndex = getHashtag(); hashRel = hashIndex; @@ -880,26 +880,26 @@ // Useful in the event the page contain several init scripts. setTimeout(function(){ $("a["+pp_settings.hook+"^='"+hashRel+"']:eq("+hashIndex+")").trigger('click'); },50); } - + return this.unbind('click.prettyphoto').bind('click.prettyphoto',$.prettyPhoto.initialize); // Return the jQuery object for chaining. The unbind method is used to avoid click conflict when the plugin is called more than once }; - + function getHashtag(){ var url = location.href; hashtag = (url.indexOf('#prettyPhoto') !== -1) ? decodeURI(url.substring(url.indexOf('#prettyPhoto')+1,url.length)) : false; if(hashtag){ hashtag = hashtag.replace(/<|>/g,''); } return hashtag; }; - + function setHashtag(){ if(typeof theRel == 'undefined') return; // theRel is set on normal calls, it's impossible to deeplink using the API location.hash = theRel + '/'+rel_index+'/'; }; - + function clearHashtag(){ if ( location.href.indexOf('#prettyPhoto') !== -1 ) location.hash = "prettyPhoto"; } - + function getParam(name,url){ name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]"); var regexS = "[\\?&]"+name+"=([^&#]*)"; @@ -907,7 +907,7 @@ var results = regex.exec( url ); return ( results == null ) ? "" : results[1]; } - + })(jQuery); var pp_alreadyInitialized = false; // Used for the deep linking to make sure not to call the same function several times. From c9de79a02f129c7ed7e37b0c23f245c1605e50ad Mon Sep 17 00:00:00 2001 From: darylteo Date: Mon, 16 Nov 2015 11:46:45 +1100 Subject: [PATCH 3/3] [FEATURE] Support allowfullscreen property Set property to true in settings. --- js/jquery.prettyPhoto.js | 188 +++++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 89 deletions(-) diff --git a/js/jquery.prettyPhoto.js b/js/jquery.prettyPhoto.js index f5976a0..d4424f5 100644 --- a/js/jquery.prettyPhoto.js +++ b/js/jquery.prettyPhoto.js @@ -1,9 +1,9 @@ /* ------------------------------------------------------------------------ - Class: prettyPhoto - Use: Lightbox clone for jQuery - Author: Stephane Caron (http://www.no-margin-for-errors.com) - Version: 3.1.6 -------------------------------------------------------------------------- */ + Class: prettyPhoto + Use: Lightbox clone for jQuery + Author: Stephane Caron (http://www.no-margin-for-errors.com) + Version: 3.1.6 + ------------------------------------------------------------------------- */ (function($) { $.prettyPhoto = {version: '3.1.6'}; @@ -34,6 +34,7 @@ changepicturecallback: function(){}, /* Called everytime an item is shown/changed */ callback: function(){}, /* Called when prettyPhoto is closed */ ie6_fallback: true, + allowfullscreen: false, markup: '
    \
     
    \
    \ @@ -87,7 +88,7 @@ image_markup: '', flash_markup: '', quicktime_markup: '', - iframe_markup: '', + iframe_markup: '', inline_markup: '
    {content}
    ', custom_markup: '', social_tools: '' /* html or false to disable */ @@ -97,13 +98,13 @@ var matchedObjects = this, percentBased = false, pp_dimensions, pp_open, // prettyPhoto container specific - pp_contentHeight, pp_contentWidth, pp_containerHeight, pp_containerWidth, + pp_contentHeight, pp_contentWidth, pp_containerHeight, pp_containerWidth, // Window size - windowHeight = $(window).height(), windowWidth = $(window).width(), + windowHeight = $(window).height(), windowWidth = $(window).width(), // Global elements - pp_slideshow; + pp_slideshow; doresize = true, scroll_pos = _get_scroll(); @@ -125,7 +126,7 @@ break; case 27: if(!settings.modal) - $.prettyPhoto.close(); + $.prettyPhoto.close(); e.preventDefault(); break; }; @@ -136,8 +137,8 @@ }; /** - * Initialize prettyPhoto. - */ + * Initialize prettyPhoto. + */ $.prettyPhoto.initialize = function() { settings = pp_settings; @@ -172,11 +173,11 @@ /** - * Opens the prettyPhoto modal box. - * @param image {String,Array} Full path to the image to be open, can also be an array containing full images paths. - * @param title {String,Array} The title to be displayed with the picture, can also be an array containing all the titles. - * @param description {String,Array} The description to be displayed with the picture, can also be an array containing all the descriptions. - */ + * Opens the prettyPhoto modal box. + * @param image {String,Array} Full path to the image to be open, can also be an array containing full images paths. + * @param title {String,Array} The title to be displayed with the picture, can also be an array containing all the titles. + * @param description {String,Array} The description to be displayed with the picture, can also be an array containing all the descriptions. + */ $.prettyPhoto.open = function(event) { if(typeof settings == "undefined"){ // Means it's an API call, need to manually get the settings and set the variables settings = pp_settings; @@ -260,7 +261,7 @@ }; imgPreloader.src = pp_images[set_position]; - break; + break; case 'youtube': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport @@ -285,8 +286,13 @@ if(settings.autoplay) movie += "&autoplay=1"; - toInject = settings.iframe_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,movie); - break; + toInject = settings.iframe_markup + .replace(/{width}/g,pp_dimensions['width']) + .replace(/{height}/g,pp_dimensions['height']) + .replace(/{wmode}/g,settings.wmode) + .replace(/{path}/g,movie) + .replace(/{allowfullscreen}/g, settings.allowfullscreen === true ? 'allowfullscreen' : ''); + break; case 'vimeo': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport @@ -301,15 +307,19 @@ vimeo_width = pp_dimensions['width'] + '/embed/?moog_width='+ pp_dimensions['width']; - toInject = settings.iframe_markup.replace(/{width}/g,vimeo_width).replace(/{height}/g,pp_dimensions['height']).replace(/{path}/g,movie); - break; + toInject = settings.iframe_markup + .replace(/{width}/g,vimeo_width) + .replace(/{height}/g,pp_dimensions['height']) + .replace(/{path}/g,movie) + .replace(/{allowfullscreen}/g, settings.allowfullscreen === true ? 'allowfullscreen' : ''); + break; case 'quicktime': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport pp_dimensions['height']+=15; pp_dimensions['contentHeight']+=15; pp_dimensions['containerHeight']+=15; // Add space for the control bar toInject = settings.quicktime_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,pp_images[set_position]).replace(/{autoplay}/g,settings.autoplay); - break; + break; case 'flash': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport @@ -321,7 +331,7 @@ filename = filename.substring(0,filename.indexOf('?')); toInject = settings.flash_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{wmode}/g,settings.wmode).replace(/{path}/g,filename+'?'+flash_vars); - break; + break; case 'iframe': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport @@ -329,8 +339,8 @@ frame_url = pp_images[set_position]; frame_url = frame_url.substr(0,frame_url.indexOf('iframe')-1); - toInject = settings.iframe_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{path}/g,frame_url); - break; + toInject = settings.iframe_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{path}/g,frame_url).replace('{allowfullscreen}/g', settings.allowfullscreen); + break; case 'ajax': doresize = false; // Make sure the dimensions are not resized. @@ -344,13 +354,13 @@ _showContent(); }); - break; + break; case 'custom': pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport toInject = settings.custom_markup; - break; + break; case 'inline': // to get the item height clone it, apply default width, wrap it in the prettyPhoto containers , then delete @@ -360,7 +370,7 @@ doresize = true; // Reset the dimensions $(myClone).remove(); toInject = settings.inline_markup.replace(/{content}/g,$(pp_images[set_position]).html()); - break; + break; }; if(!imgPreloader && !skipInjection){ @@ -376,9 +386,9 @@ /** - * Change page in the prettyPhoto modal box - * @param direction {String} Direction of the paging, previous or next. - */ + * Change page in the prettyPhoto modal box + * @param direction {String} Direction of the paging, previous or next. + */ $.prettyPhoto.changePage = function(direction){ currentGalleryPage = 0; @@ -404,9 +414,9 @@ /** - * Change gallery page in the prettyPhoto modal box - * @param direction {String} Direction of the paging, previous or next. - */ + * Change gallery page in the prettyPhoto modal box + * @param direction {String} Direction of the paging, previous or next. + */ $.prettyPhoto.changeGalleryPage = function(direction){ if(direction=='next'){ currentGalleryPage ++; @@ -429,8 +439,8 @@ /** - * Start the slideshow... - */ + * Start the slideshow... + */ $.prettyPhoto.startSlideshow = function(){ if(typeof pp_slideshow == 'undefined'){ $pp_pic_holder.find('.pp_play').unbind('click').removeClass('pp_play').addClass('pp_pause').click(function(){ @@ -445,8 +455,8 @@ /** - * Stop the slideshow... - */ + * Stop the slideshow... + */ $.prettyPhoto.stopSlideshow = function(){ $pp_pic_holder.find('.pp_pause').unbind('click').removeClass('pp_pause').addClass('pp_play').click(function(){ $.prettyPhoto.startSlideshow(); @@ -458,8 +468,8 @@ /** - * Closes prettyPhoto. - */ + * Closes prettyPhoto. + */ $.prettyPhoto.close = function(){ if($pp_overlay.is(":animated")) return; @@ -490,8 +500,8 @@ }; /** - * Set the proper sizes on the containers and animate the content in. - */ + * Set the proper sizes on the containers and animate the content in. + */ function _showContent(){ $('.pp_loaderIcon').hide(); @@ -503,10 +513,10 @@ // Resize the content holder $pp_pic_holder.find('.pp_content') - .animate({ - height:pp_dimensions['contentHeight'], - width:pp_dimensions['contentWidth'] - },settings.animation_speed); + .animate({ + height:pp_dimensions['contentHeight'], + width:pp_dimensions['contentWidth'] + },settings.animation_speed); // Resize picture the holder $pp_pic_holder.animate({ @@ -541,8 +551,8 @@ }; /** - * Hide the content...DUH! - */ + * Hide the content...DUH! + */ function _hideContent(callback){ // Fade out the current picture $pp_pic_holder.find('#pp_full_res object,#pp_full_res embed').css('visibility','hidden'); @@ -554,19 +564,19 @@ }; /** - * Check the item position in the gallery array, hide or show the navigation links - * @param setCount {integer} The total number of items in the set - */ + * Check the item position in the gallery array, hide or show the navigation links + * @param setCount {integer} The total number of items in the set + */ function _checkPosition(setCount){ (setCount > 1) ? $('.pp_nav').show() : $('.pp_nav').hide(); // Hide the bottom nav if it's not a set. }; /** - * Resize the item dimensions if it's bigger than the viewport - * @param width {integer} Width of the item to be opened - * @param height {integer} Height of the item to be opened - * @return An array containin the "fitted" dimensions - */ + * Resize the item dimensions if it's bigger than the viewport + * @param width {integer} Width of the item to be opened + * @param height {integer} Height of the item to be opened + * @return An array containin the "fitted" dimensions + */ function _fitToViewport(width,height){ resized = false; @@ -613,10 +623,10 @@ }; /** - * Get the containers dimensions according to the item size - * @param width {integer} Width of the item to be opened - * @param height {integer} Height of the item to be opened - */ + * Get the containers dimensions according to the item size + * @param width {integer} Width of the item to be opened + * @param height {integer} Height of the item to be opened + */ function _getDimensions(width,height){ width = parseFloat(width); height = parseFloat(height); @@ -730,10 +740,10 @@ // Set the proper width to the gallery items $pp_gallery - .css('margin-left',-((galleryWidth/2) + (navWidth/2))) - .find('div:first').width(galleryWidth+5) - .find('ul').width(fullGalleryWidth) - .find('li.selected').removeClass('selected'); + .css('margin-left',-((galleryWidth/2) + (navWidth/2))) + .find('div:first').width(galleryWidth+5) + .find('ul').width(fullGalleryWidth) + .find('li.selected').removeClass('selected'); goToPage = (Math.floor(set_position/itemsPerPage) < totalPage) ? Math.floor(set_position/itemsPerPage) : totalPage; @@ -791,22 +801,22 @@ }); $pp_pic_holder.find('.pp_content').hover( - function(){ - $pp_pic_holder.find('.pp_gallery:not(.disabled)').fadeIn(); - }, - function(){ - $pp_pic_holder.find('.pp_gallery:not(.disabled)').fadeOut(); - }); + function(){ + $pp_pic_holder.find('.pp_gallery:not(.disabled)').fadeIn(); + }, + function(){ + $pp_pic_holder.find('.pp_gallery:not(.disabled)').fadeOut(); + }); itemWidth = 52+5; // 52 beign the thumb width, 5 being the right margin. $pp_gallery_li.each(function(i){ $(this) - .find('a') - .click(function(){ - $.prettyPhoto.changePage(i); - $.prettyPhoto.stopSlideshow(); - return false; - }); + .find('a') + .click(function(){ + $.prettyPhoto.changePage(i); + $.prettyPhoto.stopSlideshow(); + return false; + }); }); }; @@ -823,14 +833,14 @@ $pp_pic_holder.attr('class','pp_pic_holder ' + settings.theme); // Set the proper theme $pp_overlay - .css({ - 'opacity':0, - 'height':$(document).height(), - 'width':$(window).width() + .css({ + 'opacity':0, + 'height':$(document).height(), + 'width':$(window).width() }) - .bind('click',function(){ - if(!settings.modal) $.prettyPhoto.close(); - }); + .bind('click',function(){ + if(!settings.modal) $.prettyPhoto.close(); + }); $('a.pp_close').bind('click',function(){ $.prettyPhoto.close(); return false; }); @@ -901,11 +911,11 @@ } function getParam(name,url){ - name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]"); - var regexS = "[\\?&]"+name+"=([^&#]*)"; - var regex = new RegExp( regexS ); - var results = regex.exec( url ); - return ( results == null ) ? "" : results[1]; + name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]"); + var regexS = "[\\?&]"+name+"=([^&#]*)"; + var regex = new RegExp( regexS ); + var results = regex.exec( url ); + return ( results == null ) ? "" : results[1]; } })(jQuery);