summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-03-05 09:24:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-05 09:24:41 -0800
commit2e426cf07ce61c00acdb477c6c049b0c1f92f082 (patch)
tree3b628dd3460f31a7fe2a25c92c617c2457be6b10 /tools
parent696e7f916cf88241e808b95d2e4af53582959dd5 (diff)
parent3ab162e71cbe88ec4d2207c39b9f3d2d7f4c965c (diff)
downloadbuild-2e426cf07ce61c00acdb477c6c049b0c1f92f082.zip
build-2e426cf07ce61c00acdb477c6c049b0c1f92f082.tar.gz
build-2e426cf07ce61c00acdb477c6c049b0c1f92f082.tar.bz2
am 3ab162e7: docs: script update to account for double-nested list items when scrolling sidenav into view
* commit '3ab162e71cbe88ec4d2207c39b9f3d2d7f4c965c': docs: script update to account for double-nested list items when scrolling sidenav into view
Diffstat (limited to 'tools')
-rw-r--r--tools/droiddoc/templates-sdk/assets/android-developer-docs.js19
1 files changed, 15 insertions, 4 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.js b/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
index 97b831a..728e015 100644
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
@@ -502,14 +502,25 @@ function scrollIntoView(nav) {
if (navObj.is(':visible')) {
var selected = $(".selected", navObj);
if (selected.length == 0) return;
- if (selected.is("div")) selected = selected.parent();
+ if (selected.is("div")) selected = selected.parent(); // when the selected item is a parent
var scrolling = document.getElementById(nav);
var navHeight = navObj.height();
var offsetTop = selected.position().top;
- if (selected.parent().parent().is(".toggle-list")) offsetTop += selected.parent().parent().position().top;
- if(offsetTop > navHeight - 92) {
- scrolling.scrollTop = offsetTop - navHeight + 92;
+
+ // handle nested items
+ if (selected.parent().parent().is(".toggle-list")) {
+ selected = selected.parent().parent();
+ // handle second level nested items
+ if (selected.parent().parent().is(".toggle-list")) {
+ selected = selected.parent().parent();
+ }
+ offsetTop += selected.position().top;
+ }
+
+ // 180px from the bottom of the list is the threshold
+ if(offsetTop > navHeight - 180) {
+ scrolling.scrollTop = offsetTop - navHeight + 180;
}
}
}