am a39d3bb0: docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable
Merge commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a' into eclair-plus-aosp
* commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a':
docs: fix resizeAll script for IE6 so that the resizeWidth function
diff --git a/tools/droiddoc/templates/assets/android-developer-docs.js b/tools/droiddoc/templates/assets/android-developer-docs.js
index 08e47fa..f4da462 100644
--- a/tools/droiddoc/templates/assets/android-developer-docs.js
+++ b/tools/droiddoc/templates/assets/android-developer-docs.js
@@ -136,12 +136,13 @@
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 @@
* avoiding this for all browsers provides better performance */
function resizeAll() {
resizeHeight();
- resizeWidth();
+ if ($(".side-nav-resizable").length) {
+ resizeWidth();
+ }
}
function getBaseUri(uri) {