Merge branch 'eclair' into eclair-release

This commit is contained in:
android-build SharedAccount 2009-12-16 07:40:36 -08:00
commit aae82b6679

View file

@ -182,7 +182,7 @@ function highlightNav(fullPageName) {
var htmlPos = fullPageName.lastIndexOf(".html", fullPageName.length);
var pathPageName = fullPageName.slice(firstSlashPos, htmlPos + 5);
var link = $("#devdoc-nav a[href$='"+ pathPageName+"']");
if ((link.length == 0) && (fullPageName.indexOf("/guide/") != -1)) {
if ((link.length == 0) && ((fullPageName.indexOf("/guide/") != -1) || (fullPageName.indexOf("/resources/") != -1))) {
// if there's no match, then let's backstep through the directory until we find an index.html page that matches our ancestor directories (only for dev guide)
lastBackstep = pathPageName.lastIndexOf("/");
while (link.length == 0) {