diff options
author | Scott Main <smain@google.com> | 2010-01-06 14:18:02 -0800 |
---|---|---|
committer | Scott Main <smain@google.com> | 2010-01-06 16:58:52 -0800 |
commit | b6da4808699180c608bccef88ddb843411e663c7 (patch) | |
tree | ef548102c34bffc550e9a4245cafd746876f8738 /tools/droiddoc/templates/assets | |
parent | a39d3bb0c9001c79f93ae829d564e5fef27a573a (diff) | |
download | build-b6da4808699180c608bccef88ddb843411e663c7.zip build-b6da4808699180c608bccef88ddb843411e663c7.tar.gz build-b6da4808699180c608bccef88ddb843411e663c7.tar.bz2 |
update for change Ia39d3bb0, which regressed a resizing hack for IE6.
This now will avoid writing the cookie for the width when IE6 calls
resizeWidth() in order to properly resize the doc-content div (other
browsers to not call resizeWidth() for resizing doc-content because it
has auto width, which IE6 does not perform).
Diffstat (limited to 'tools/droiddoc/templates/assets')
-rw-r--r-- | tools/droiddoc/templates/assets/android-developer-docs.js | 12 |
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) { |