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

Merge commit '915334025e0c7a5b77c387315118e687461e4842'

* commit '915334025e0c7a5b77c387315118e687461e4842':
  update for change Ia39d3bb0, which regressed a resizing hack for IE6.
This commit is contained in:
Scott Main 2010-01-07 10:08:48 -08:00 committed by Android Git Automerger
commit 554d1fa649
1 changed files with 6 additions and 6 deletions

View File

@ -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) {