From 477ebe18d44d1c8e74790ec85a93c1f0fcbad9eb Mon Sep 17 00:00:00 2001 From: Tim Wong Date: Wed, 9 Mar 2016 10:16:40 +0800 Subject: [PATCH] FIX: incorrect overlay position and size upon orientation change on mobile devices --- js/jquery.prettyPhoto.js | 281 ++++++++++++++++++++------------------- 1 file changed, 144 insertions(+), 137 deletions(-) diff --git a/js/jquery.prettyPhoto.js b/js/jquery.prettyPhoto.js index 9ecf9d1..f1fe841 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,46 @@ }; }); }; - + /** * 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(); }); - - + + if(settings.allow_resize) { + $(window) + .bind('scroll.prettyphoto',function(){ _center_overlay(); }) + .bind('orientationchange.prettyphoto', function() { + _hideContent(function(){ + setTimeout($.prettyPhoto.open, 500); // Wait for the orientation change to complete + }); + }); + } + + $.prettyPhoto.open(); - + return false; } @@ -187,22 +194,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 +223,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 +265,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/'); @@ -281,75 +288,75 @@ movie = 'http://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); - + movie = 'http://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(); @@ -363,7 +370,7 @@ if(!imgPreloader && !skipInjection){ $pp_pic_holder.find('#pp_full_res')[0].innerHTML = toInject; - + // Show content _showContent(); }; @@ -372,14 +379,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; @@ -389,7 +396,7 @@ }else{ set_position=direction; }; - + rel_index = set_position; if(!doresize) doresize = true; // Allow the resizing of the images @@ -417,7 +424,7 @@ }else{ currentGalleryPage = direction; }; - + slide_speed = (direction == 'next' || direction == 'previous') ? settings.animation_speed : 0; slide_to = currentGalleryPage * (itemsPerPage * itemWidth); @@ -437,7 +444,7 @@ }); pp_slideshow = setInterval($.prettyPhoto.startSlideshow,settings.slideshow); }else{ - $.prettyPhoto.changePage('next'); + $.prettyPhoto.changePage('next'); }; } @@ -460,33 +467,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'); - + + $(window).unbind('scroll.prettyphoto orientationchange.prettyphoto'); + clearHashtag(); - + settings.callback(); - + doresize = true; - + pp_open = false; - + delete settings; }); }; - + /** * Set the proper sizes on the containers and animate the content in. */ @@ -505,7 +512,7 @@ height:pp_dimensions['contentHeight'], width:pp_dimensions['contentWidth'] },settings.animation_speed); - + // Resize picture the holder $pp_pic_holder.animate({ 'top': projectedTop, @@ -518,7 +525,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(); @@ -526,18 +533,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! */ @@ -546,11 +553,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 @@ -558,7 +565,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 @@ -569,13 +576,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); @@ -589,16 +596,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), @@ -609,7 +616,7 @@ resized:resized }; }; - + /** * Get the containers dimensions according to the item size * @param width {integer} Width of the item to be opened @@ -618,12 +625,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 @@ -631,7 +638,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); @@ -642,20 +649,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'; @@ -671,7 +678,7 @@ return 'image'; }; }; - + function _center_overlay(){ if(doresize && typeof $pp_pic_holder != 'undefined') { scroll_pos = _get_scroll(); @@ -679,7 +686,7 @@ projectedTop = (windowHeight/2) + scroll_pos['scrollTop'] - (contentHeight/2); if(projectedTop < 0) projectedTop = 0; - + if(contentHeight > windowHeight) return; @@ -689,7 +696,7 @@ }); }; }; - + function _get_scroll(){ if (self.pageYOffset) { return {scrollTop:self.pageYOffset,scrollLeft:self.pageXOffset}; @@ -699,18 +706,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; @@ -725,36 +732,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; @@ -769,25 +776,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(); @@ -807,8 +814,8 @@ }); }); }; - - + + // Inject the play/pause if it's a slideshow if(settings.slideshow){ $pp_pic_holder.find('.pp_nav').prepend('Play') @@ -817,9 +824,9 @@ return false; }); } - + $pp_pic_holder.attr('class','pp_pic_holder ' + settings.theme); // Set the proper theme - + $pp_overlay .css({ 'opacity':0, @@ -843,31 +850,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; @@ -878,26 +885,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+"=([^&#]*)"; @@ -905,7 +912,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.