diff options
| author | Scott Main <smain@google.com> | 2012-12-19 19:23:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-19 19:23:32 -0800 |
| commit | 707909f2e0fb9ccc0db859ec075a3557f5265e56 (patch) | |
| tree | 8bc08a3c680c5e8f7b9da907c10641a7f7886350 /tools | |
| parent | 6a6c11215bdf3f114ed3589ede4bda006adacf7e (diff) | |
| parent | b8d06a55e0fbe02c9ef31f4ccef2571e74c371d7 (diff) | |
| download | build-707909f2e0fb9ccc0db859ec075a3557f5265e56.zip build-707909f2e0fb9ccc0db859ec075a3557f5265e56.tar.gz build-707909f2e0fb9ccc0db859ec075a3557f5265e56.tar.bz2 | |
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 overscroll bounce." into jb-mr1-dev
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/droiddoc/templates-sdk/assets/js/docs.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js index b5f8946..d603269 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 |