am b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.

Merge commit 'b6da4808699180c608bccef88ddb843411e663c7' into eclair-plus-aosp

* commit 'b6da4808699180c608bccef88ddb843411e663c7':
  update for change Ia39d3bb0, which regressed a resizing hack for IE6.

1 files changed, 6 insertions, 6 deletions

diff --git a/tools/droiddoc/templates/assets/android-developer-docs.js b/tools/droiddoc/templates/assets/android-developer-docs.js
index f4da462..fa24e99 100644
--- a/tools/droiddoc/templates/assets/android-developer-docs.js
+++ b/tools/droiddoc/templates/assets/android-developer-docs.js
@@ -260,9 +260,11 @@ function resizeWidth() {
   classesNav.css({width:sidenavWidth});
   $("#packages-nav").css({width:sidenavWidth});
 
-  var basePath = getBaseUri(location.pathname);
-  var section = basePath.substring(1,basePath.indexOf("/",1));
-  writeCookie("width", sidenavWidth, section, null);
+  if ($(".side-nav-resizable").length) { // Must check if the nav is resizable because IE6 calls resizeWidth() from resizeAll() for all pages
+    var basePath = getBaseUri(location.pathname);
+    var section = basePath.substring(1,basePath.indexOf("/",1));
+    writeCookie("width", sidenavWidth, section, null);
+  }
 }
 
 /* For IE6 only,
@@ -270,9 +272,7 @@ function resizeWidth() {
  * avoiding this for all browsers provides better performance */
 function resizeAll() {
   resizeHeight();
-  if ($(".side-nav-resizable").length) {
-    resizeWidth();
-  }
+  resizeWidth();
 }
 
 function getBaseUri(uri) {