StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'b6da4808699180c608bccef88ddb843411e663c7' into eclair-plus-aosp

* commit 'b6da4808699180c608bccef88ddb843411e663c7':
  update for change Ia39d3bb0, which regressed a resizing hack for IE6.
This commit is contained in:
Scott Main
2010-01-07 10:06:00 -08:00
committed by Android Git Automerger
parent 83e855494b b6da480869
commit 915334025e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/droiddoc/templates/assets/android-developer-docs.js
View File

@@ -260,20 +260,20 @@ function resizeWidth() {
classesNav.css({width:sidenavWidth}); classesNav.css({width:sidenavWidth});
$("#packages-nav").css({width:sidenavWidth}); $("#packages-nav").css({width:sidenavWidth});
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 basePath = getBaseUri(location.pathname);
var section = basePath.substring(1,basePath.indexOf("/",1)); var section = basePath.substring(1,basePath.indexOf("/",1));
writeCookie("width", sidenavWidth, section, null); writeCookie("width", sidenavWidth, section, null);
} }
}
/* For IE6 only, /* For IE6 only,
* because it can't properly perform auto width for "doc-content" div, * because it can't properly perform auto width for "doc-content" div,
* avoiding this for all browsers provides better performance */ * avoiding this for all browsers provides better performance */
function resizeAll() { function resizeAll() {
resizeHeight(); resizeHeight();
if ($(".side-nav-resizable").length) {
resizeWidth(); resizeWidth();
} }
}
function getBaseUri(uri) { function getBaseUri(uri) {
var intlUrl = (uri.substring(0,6) == "/intl/"); var intlUrl = (uri.substring(0,6) == "/intl/");