Skip to content
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

Jump to bottom

Add settings options for vertical scrolling and horizontal scrolling #786

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

Add settings options for vertical scrolling and horizontal scrolling #786

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cde499
add the ability to specify vertical scrolling and horizontal scrolling
marcusshepp Jul 7, 2016
2e71ec3
mistake in my knowledge of horiz. vs vert.
marcusshepp Jul 7, 2016
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
4 changes: 4 additions & 0 deletions jquery.colorbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
maxHeight: false,
scalePhotos: true,
scrolling: true,
verticalScrolling: true,
horizontalScrolling: true,
opacity: 0.9,
preloading: true,
className: false,
Expand Down Expand Up @@ -801,6 +803,8 @@
.appendTo($loadingBay.show())// content has to be appended to the DOM for accurate size calculations.
.css({width: getWidth(), overflow: settings.get('scrolling') ? 'auto' : 'hidden'})
.css({height: getHeight()})// sets the height independently from the width in case the new width influences the value of height.
.css({overflowY:settings.get('verticalScrolling') ? 'auto' : 'hidden'})
.css({overflowX:settings.get('horizontalScrolling') ? 'auto' : 'hidden'})
.prependTo($content);

$loadingBay.hide();
Expand Down