diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2009-07-29 12:25:44 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2009-07-29 12:25:44 -0700 |
| commit | 3b1ee3789c4f09a196f801645a15443d81ba6745 (patch) | |
| tree | 74be178d5417c36289496e2fef540e2134b11941 | |
| parent | df09424f19ca8d455037b19641b15a7c55d9523f (diff) | |
| download | build-3b1ee3789c4f09a196f801645a15443d81ba6745.zip build-3b1ee3789c4f09a196f801645a15443d81ba6745.tar.gz build-3b1ee3789c4f09a196f801645a15443d81ba6745.tar.bz2 | |
Reapply modifications from 3175 to fix display of navTree in doc output.
| -rw-r--r-- | tools/droiddoc/templates-sdk/customization.cs | 5 | ||||
| -rw-r--r-- | tools/droiddoc/templates/assets/android-developer-docs.js | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/tools/droiddoc/templates-sdk/customization.cs b/tools/droiddoc/templates-sdk/customization.cs index d6e6795..79fc282 100644 --- a/tools/droiddoc/templates-sdk/customization.cs +++ b/tools/droiddoc/templates-sdk/customization.cs @@ -159,8 +159,9 @@ def:default_left_nav() ?> if (!isMobile) { $("<a href='#' id='nav-swap' onclick='swapNav();return false;' style='font-size:10px;line-height:9px;margin-left:1em;text-decoration:none;'><span id='tree-link'>Use Tree Navigation</span><span id='panel-link' style='display:none'>Use Panel Navigation</span></a>").appendTo("#side-nav"); chooseDefaultNav(); - if ($("#nav-tree").is(':visible')) init_navtree("nav-tree", "<?cs var:toroot ?>", NAVTREE_DATA); - else { + if ($("#nav-tree").is(':visible')) { + init_default_navtree("<?cs var:toroot ?>"); + } else { addLoadEvent(function() { scrollIntoView("packages-nav"); scrollIntoView("classes-nav"); diff --git a/tools/droiddoc/templates/assets/android-developer-docs.js b/tools/droiddoc/templates/assets/android-developer-docs.js index af1b700..2edf39d 100644 --- a/tools/droiddoc/templates/assets/android-developer-docs.js +++ b/tools/droiddoc/templates/assets/android-developer-docs.js @@ -31,6 +31,15 @@ if ((agent.indexOf("Mobile") != -1) || addLoadEvent(mobileSetup); } +/* loads the lists.js file to the page. +Loading this in the head was slowing page load time */ +addLoadEvent( function() { + var lists = document.createElement("script"); + lists.setAttribute("type","text/javascript"); + lists.setAttribute("src", toRoot+"reference/lists.js"); + $("head").append($(lists)); +} ); + window.onresize = resizeAll; function mobileSetup() { @@ -306,7 +315,7 @@ function swapNav() { nav_pref = NAV_PREF_PANELS; } else { nav_pref = NAV_PREF_TREE; - init_navtree("nav-tree", toRoot, NAVTREE_DATA); + init_default_navtree(toRoot); } var date = new Date(); date.setTime(date.getTime()+(10*365*24*60*60*1000)); // keep this for 10 years |