156368 patch by t.bugz@lament.cjb.net r=naving sr=bienvenu a=roc+moz fixing quicksearch fails if focus was in threadpane before search box

This commit is contained in:
naving%netscape.com 2002-07-12 17:57:02 +00:00
Родитель 5de18c78dc
Коммит 1abe49ca36
2 изменённых файлов: 13 добавлений и 13 удалений

Просмотреть файл

@ -110,13 +110,13 @@ function setTitleFromFolder(msgfolder, subject)
else
title = "";
if (msgfolder.isServer)
if (msgfolder.isServer)
{
if (server.type == "none")
title += server.prettyName;
else
// <hostname>
title += server.hostName;
if (server.type == "none")
title += server.prettyName;
else
// <hostname>
title += server.hostName;
}
else {
var middle;
@ -712,6 +712,7 @@ function FolderPaneSelectionChange()
if (searchInput)
searchInput.value = "";
}
ClearMessagePane();
ChangeFolderByURI(folderResource.Value, viewType, viewFlags, sortType, sortOrder);
}
}
@ -725,10 +726,8 @@ function FolderPaneSelectionChange()
UpdateMailToolbar("gAccountCentralLoaded");
else if (gFakeAccountPageLoaded)
UpdateMailToolbar("gFakeAccountPageLoaded");
else {
else
document.getElementById('advancedButton').setAttribute("disabled" , !(IsCanSearchMessagesEnabled()));
ClearMessagePane();
}
if (gDisplayStartupPage)
{

Просмотреть файл

@ -784,7 +784,7 @@ function GetMessagePane()
function GetMessagePaneFrame()
{
if (gMessagePaneFrame) return gMessagePaneFrame;
gMessagePaneFrame = top.frames['messagepane'];
gMessagePaneFrame = document.getElementById("messagepane");
return gMessagePaneFrame;
}
@ -871,9 +871,9 @@ function ClearMessagePane()
{
gHaveLoadedMessage = false;
gCurrentDisplayedMessage = null;
if (window.frames["messagepane"].location != "about:blank")
window.frames["messagepane"].location = "about:blank";
// hide the message header view AND the message pane...
if (GetMessagePaneFrame().currentURI != "about:blank")
GetMessagePaneFrame().loadURI("about:blank");
// hide the message header view AND the message pane...
HideMessageHeaderPane();
}
}
@ -1260,3 +1260,4 @@ function GetFolderAttribute(tree, source, attribute)
target = target.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
return target;
}