From a39d3bb0c9001c79f93ae829d564e5fef27a573a Mon Sep 17 00:00:00 2001 From: Scott Main Date: Wed, 6 Jan 2010 14:18:02 -0800 Subject: [PATCH] docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable This stops 'width' cookies from being written for the SDK docs (and any other page that doesn't have resizable nav) and also adds some security to the init() function to be sure we properly read cookie names. --- .../templates/assets/android-developer-docs.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/droiddoc/templates/assets/android-developer-docs.js b/tools/droiddoc/templates/assets/android-developer-docs.js index 08e47fad60..f4da4626a1 100644 --- a/tools/droiddoc/templates/assets/android-developer-docs.js +++ b/tools/droiddoc/templates/assets/android-developer-docs.js @@ -136,12 +136,13 @@ function init() { sidenav = $("#side-nav"); devdocNav = $("#devdoc-nav"); + var cookiePath = ""; if (location.href.indexOf("/reference/") != -1) { - var cookiePath = "reference_"; + cookiePath = "reference_"; } else if (location.href.indexOf("/guide/") != -1) { - var cookiePath = "guide_"; + cookiePath = "guide_"; } else if (location.href.indexOf("/resources/") != -1) { - var cookiePath = "resources_"; + cookiePath = "resources_"; } if (!isMobile) { @@ -269,7 +270,9 @@ function resizeWidth() { * avoiding this for all browsers provides better performance */ function resizeAll() { resizeHeight(); - resizeWidth(); + if ($(".side-nav-resizable").length) { + resizeWidth(); + } } function getBaseUri(uri) {