diff options
author | Scott Main <smain@google.com> | 2010-01-07 10:06:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-07 10:06:00 -0800 |
commit | 915334025e0c7a5b77c387315118e687461e4842 (patch) | |
tree | 4e4fdfb0ff2245b8fe9bb5c85797322e8edd91c2 /tools/droiddoc/templates/assets | |
parent | 83e855494b0b4215c78593efdf69b98c115288f1 (diff) | |
parent | b6da4808699180c608bccef88ddb843411e663c7 (diff) | |
download | build-915334025e0c7a5b77c387315118e687461e4842.zip build-915334025e0c7a5b77c387315118e687461e4842.tar.gz build-915334025e0c7a5b77c387315118e687461e4842.tar.bz2 |
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.
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) { |