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

Update jquery.slimscroll.js #172

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update jquery.slimscroll.js #172

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
7 changes: 5 additions & 2 deletions jquery.slimscroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@
borderRadius: '7px',

// sets border radius of the rail
railBorderRadius : '7px'
railBorderRadius : '7px',

// whether the scroll div should take the height of its parent when the height is set to auto
matchParentHeight : true,
};

var o = $.extend(defaults, options);
Expand Down Expand Up @@ -151,7 +154,7 @@
}

// optionally set height to the parent's height
o.height = (o.height == 'auto') ? me.parent().height() : o.height;
o.height = ((o.height == 'auto')&&(o.matchParentHeight === true)) ? me.parent().height() : o.height;

// wrap content
var wrapper = $(divS)
Expand Down