aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-01-06 14:18:02 -0800
committerScott Main <smain@google.com>2010-01-06 14:33:20 -0800
commita39d3bb0c9001c79f93ae829d564e5fef27a573a (patch)
treea3b71b2711511083bfa427ac3d744715f0879545
parent1e43c510758439b3195597056121c59b71481254 (diff)
downloadbuild-a39d3bb0c9001c79f93ae829d564e5fef27a573a.tar.gz
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.
-rw-r--r--tools/droiddoc/templates/assets/android-developer-docs.js11
1 files 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) {