Skip to content

New feature: Space between container and browser window and fullscreen zoom #127

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
cbelizon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

New feature: Space between container and browser window and fullscreen zoom #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions js/jquery.prettyPhoto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
show_title: true, /* true/false */
allow_resize: true, /* Resize the photos bigger than viewport. true/false */
allow_expand: true, /* Allow the user to expand a resized image. true/false */
default_width: 500,
default_height: 344,
default_width: 500, /* Default image width */
default_height: 344, /* Default image height */
counter_separator_label: '/', /* The separator for the gallery counter 1 "of" 2 */
theme: 'pp_default', /* light_rounded / dark_rounded / light_square / dark_square / facebook */
horizontal_padding: 20, /* The padding on each side of the picture */
Expand All @@ -34,6 +34,8 @@
changepicturecallback: function(){}, /* Called everytime an item is shown/changed */
callback: function(){}, /* Called when prettyPhoto is closed */
ie6_fallback: true,
default_resize: 200,
default_multiplier: 1,
markup: '<div class="pp_pic_holder"> \
<div class="ppt">&nbsp;</div> \
<div class="pp_top"> \
Expand Down Expand Up @@ -249,7 +251,7 @@

imgPreloader.onload = function(){
// Fit item to viewport
pp_dimensions = _fitToViewport(imgPreloader.width,imgPreloader.height);
pp_dimensions = _fitToViewport(imgPreloader.width * settings.default_multiplier,imgPreloader.height * settings.default_multiplier);

_showContent();
};
Expand Down Expand Up @@ -578,10 +580,10 @@

while (!fitting){
if((pp_containerWidth > windowWidth)){
imageWidth = (windowWidth - 200);
imageWidth = (windowWidth - settings.default_resize);
imageHeight = (height/width) * imageWidth;
}else if((pp_containerHeight > windowHeight)){
imageHeight = (windowHeight - 200);
imageHeight = (windowHeight - settings.default_resize);
imageWidth = (width/height) * imageHeight;
}else{
fitting = true;
Expand Down