Merge change 9009 into donut (7ebafd5a) · Commits · e / os / android_build

tools/droiddoc/templates-sdk/customization.cs

+3 −2

Original line number	Diff line number	Diff line
		@@ -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");

+10 −1

Original line number	Diff line number	Diff line
		@@ -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()+(10365246060*1000)); // keep this for 10 years