Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix searching of sub-folders r=putterman 44383

Browse Source
This commit is contained in:
bienvenu%netscape.com 2000-08-21 21:25:54 +00:00
parent 58510a6e28
commit 4fcdd3225a
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mailnews/base/search/resources/content/SearchDialog.js
View File

@ -141,6 +141,30 @@ function onSearch(event)
gSearchSession.addScopeTerm(GetScopeForFolder(gCurrentFolder),
gCurrentFolder);
var searchSubfolders = document.getElementById("checkSearchSubFolders").checked;
if (searchSubfolders && gCurrentFolder && gCurrentFolder.hasSubFolders)
{
var subFolderEnumerator = gCurrentFolder.GetSubFolders();
var done = false;
while (!done)
{
var next = subFolderEnumerator.currentItem();
if (next)
{
var nextFolder = next.QueryInterface(Components.interfaces.nsIMsgFolder);
if (nextFolder)
gSearchSession.addScopeTerm(GetScopeForFolder(nextFolder), nextFolder);
}
try
{
subFolderEnumerator.next();
}
catch (ex)
{
done = true;
}
}
}
// reflect the search widgets back into the search session
saveSearchTerms(gSearchSession.searchTerms, gSearchSession);

4
mailnews/base/search/resources/content/SearchDialog.xul
View File

@ -54,9 +54,7 @@ Rights Reserved.
<menulist id="searchableFolders" flex="2"
oncommand="onChooseFolder(event)"/>
<spring flex="1"/>
<!--
<checkbox value="&searchSubfolders.label;"/>
-->
<checkbox id="checkSearchSubFolders" value="&searchSubfolders.label;"/>
</box>
<separator/>
<text class="label" value="&conditionDesc.label;"/>