Skip to content

Support for pdf and margin settings #122

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
aberbenni wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support for pdf and margin settings #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3db8cb4
Update jquery.prettyPhoto.js
aberbenni Apr 8, 2013
900a223
Update README
aberbenni Apr 8, 2013
647506a
added support for pdf
aberbenni Apr 16, 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
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
prettyPhoto v3.1.4
prettyPhoto v3.1.5
© Copyright, Stephane Caron
http://www.no-margin-for-errors.com

Expand Down
24 changes: 18 additions & 6 deletions js/jquery.prettyPhoto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

$.fn.prettyPhoto = function(pp_settings) {
pp_settings = jQuery.extend({
horizontal_margin: 150, /* default 150, min 25 */
vertical_margin: 150, /* default 150, min 50 */
hook: 'rel', /* the attribute tag to use for prettyPhoto hooks. default: 'rel'. For HTML5, use "data-rel" or similar. */
animation_speed: 'fast', /* fast/slow/normal */
ajaxcallback: function() {},
Expand Down Expand Up @@ -223,9 +225,9 @@

// 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; }

if(movie_height.indexOf('%') != -1) { movie_height = parseFloat(($(window).height() * parseFloat(movie_height) / 100) - (pp_settings.vertical_margin<50?50:pp_settings.vertical_margin)); percentBased = true; }
if(movie_width.indexOf('%') != -1) { movie_width = parseFloat(($(window).width() * parseFloat(movie_width) / 100) - (pp_settings.horizontal_margin<25?25:pp_settings.horizontal_margin)); percentBased = true; }
// Fade the holder
$pp_pic_holder.fadeIn(function(){
// Set the title
Expand Down Expand Up @@ -320,7 +322,15 @@

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 'pdf':
pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport

frame_url = pp_images[set_position];

toInject = settings.iframe_markup.replace(/{width}/g,pp_dimensions['width']).replace(/{height}/g,pp_dimensions['height']).replace(/{path}/g,frame_url);
break;

case 'iframe':
pp_dimensions = _fitToViewport(movie_width,movie_height); // Fit item to viewport

Expand Down Expand Up @@ -567,7 +577,7 @@
*/
function _fitToViewport(width,height){
resized = false;

_getDimensions(width,height);

// Define them in case there's no resize needed
Expand Down Expand Up @@ -598,7 +608,7 @@

_getDimensions(imageWidth,imageHeight);
};

return {
width:Math.floor(imageWidth),
height:Math.floor(imageHeight),
Expand Down Expand Up @@ -667,6 +677,8 @@
return 'custom';
}else if(itemSrc.substr(0,1) == '#'){
return 'inline';
}else if(itemSrc.match(/\b.pdf\b/i)){
return 'pdf';
}else{
return 'image';
};
Expand Down