diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-24 16:04:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-24 16:04:56 -0700 |
| commit | e85be87ee6e17df30c1cdfee523e8e8f255ebf62 (patch) | |
| tree | 010cf65ba44e9873ab3a9b430ab5460ed3f43d53 | |
| parent | 1e96ac8430da922332e4c85e7eed0e95442ff2ce (diff) | |
| parent | 5b53cd78cd7ac1469b4e2985098bd04dca00a296 (diff) | |
| download | build-e85be87ee6e17df30c1cdfee523e8e8f255ebf62.zip build-e85be87ee6e17df30c1cdfee523e8e8f255ebf62.tar.gz build-e85be87ee6e17df30c1cdfee523e8e8f255ebf62.tar.bz2 | |
Merge change 3175 into donut
* changes:
page load perfomance improvements... remove the lists.js file from the <head>, which slows down page load a lot (over 300K), and instead load it dynamically on page load. also remove navtree_data.js from the <head>, which also slows the load and is only used in the reference when in tree view. This file is now loaded during the initialization of the nav tree.
| -rw-r--r-- | tools/droiddoc/templates-sdk/customization.cs | 5 | ||||
| -rw-r--r-- | tools/droiddoc/templates/assets/android-developer-docs.js | 11 | ||||
| -rw-r--r-- | tools/droiddoc/templates/assets/navtree.js | 14 | ||||
| -rw-r--r-- | tools/droiddoc/templates/head_tag.cs | 2 |
4 files changed, 26 insertions, 6 deletions
diff --git a/tools/droiddoc/templates-sdk/customization.cs b/tools/droiddoc/templates-sdk/customization.cs index 0cb85e8..9ec1f44 100644 --- a/tools/droiddoc/templates-sdk/customization.cs +++ b/tools/droiddoc/templates-sdk/customization.cs @@ -151,8 +151,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 016fa4e..160e492 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() { @@ -282,7 +291,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 diff --git a/tools/droiddoc/templates/assets/navtree.js b/tools/droiddoc/templates/assets/navtree.js index f48e1dc..8e7a91c 100644 --- a/tools/droiddoc/templates/assets/navtree.js +++ b/tools/droiddoc/templates/assets/navtree.js @@ -144,8 +144,20 @@ function find_page(url, data) return null; } +function load_navtree_data(toroot) { + var navtreeData = document.createElement("script"); + navtreeData.setAttribute("type","text/javascript"); + navtreeData.setAttribute("src", toroot+"navtree_data.js"); + $("head").append($(navtreeData)); +} + +function init_default_navtree(toroot) { + load_navtree_data(toroot); + init_navtree("nav-tree", toroot, NAVTREE_DATA); +} + function init_navtree(navtree_id, toroot, root_nodes) -{ +{ var me = new Object(); me.toroot = toroot; me.node = new Object(); diff --git a/tools/droiddoc/templates/head_tag.cs b/tools/droiddoc/templates/head_tag.cs index 61559e1..f721403 100644 --- a/tools/droiddoc/templates/head_tag.cs +++ b/tools/droiddoc/templates/head_tag.cs @@ -11,14 +11,12 @@ else ?> <link href="<?cs var:toroot ?>assets/android-developer-docs.css" rel="stylesheet" type="text/css" /><?cs /if ?> <script src="<?cs var:toroot ?>assets/search_autocomplete.js" type="text/javascript"></script> -<script src="<?cs var:toroot ?>reference/lists.js" type="text/javascript"></script> <script src="<?cs var:toroot ?>assets/jquery-resizable.min.js" type="text/javascript"></script> <script src="<?cs var:toroot ?>assets/android-developer-docs.js" type="text/javascript"></script> <script type="text/javascript"> setToRoot("<?cs var:toroot ?>"); </script><?cs if:reference ?> -<script src="<?cs var:toroot ?>navtree_data.js" type="text/javascript"></script> <script src="<?cs var:toroot ?>assets/navtree.js" type="text/javascript"></script><?cs /if ?> <noscript> |