tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscr

Browse source 
* commit '707909f2e0fb9ccc0db859ec075a3557f5265e56':
  docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
This commit is contained in:
Scott Main 2012-12-19 19:25:37 -08:00 committed by Android Git Automerger
commit c9cea375c3
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/droiddoc/templates-sdk/assets/js/docs.js
View file

@ -358,7 +358,13 @@ false; // navigate across topic boundaries only in design docs
var searchResultHeight = $('#searchResults').is(":visible") ? var searchResultHeight = $('#searchResults').is(":visible") ?
$('#searchResults').outerHeight() : 0; $('#searchResults').outerHeight() : 0;
var totalHeaderHeight = headerHeight + subheaderHeight + searchResultHeight; var totalHeaderHeight = headerHeight + subheaderHeight + searchResultHeight;
// we set the navbar fixed when the scroll position is beyond the height of the site header...
var navBarShouldBeFixed = scrollTop > totalHeaderHeight; var navBarShouldBeFixed = scrollTop > totalHeaderHeight;
// ... except if the document content is shorter than the sidenav height.
// (this is necessary to avoid crazy behavior on OSX Lion due to overscroll bouncing)
if ($("#doc-col").height() < $("#side-nav").height()) {
navBarShouldBeFixed = false;
}
var scrollLeft = $(window).scrollLeft(); var scrollLeft = $(window).scrollLeft();
// When the sidenav is fixed and user scrolls horizontally, reposition the sidenav to match // When the sidenav is fixed and user scrolls horizontally, reposition the sidenav to match