From b8d06a55e0fbe02c9ef31f4ccef2571e74c371d7 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Wed, 19 Dec 2012 18:38:24 -0800 Subject: [PATCH] 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. Change-Id: I1be1c170e327f3cdfe81076a473f74425b8bd080 --- tools/droiddoc/templates-sdk/assets/js/docs.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js index b5f8946117..d6032691fa 100644 --- a/tools/droiddoc/templates-sdk/assets/js/docs.js +++ b/tools/droiddoc/templates-sdk/assets/js/docs.js @@ -358,7 +358,13 @@ false; // navigate across topic boundaries only in design docs var searchResultHeight = $('#searchResults').is(":visible") ? $('#searchResults').outerHeight() : 0; 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; + // ... 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(); // When the sidenav is fixed and user scrolls horizontally, reposition the sidenav to match