Bug #261199 --> Convert the advanced search / Save as Virtual Folder button

and the Views / Save As Search Folder menu item
to use the new virtual folder dialog UI
This commit is contained in:
scott%scott-macgregor.org 2004-10-19 03:17:53 +00:00
parent 86cb7d495c
commit 33f0db78e8
3 changed files with 3 additions and 20 deletions

View File

@ -993,23 +993,6 @@ function RemoveMailOfflineObserver()
observerService.removeObserver(mailOfflineObserver,"network:offline-status-changed");
}
// This routine (getViewName) will become obsolete once all of the callers have been converted
// to use openNewVirtualFolderDialogWithArgs
function getViewName(okCallbackFunc, defaultViewName)
{
var preselectedURI = GetSelectedFolderURI();
var folderTree = GetFolderTree();
var name = GetFolderNameFromUri(preselectedURI, folderTree);
name += defaultViewName + "-view";
var dialog = window.openDialog(
"chrome://messenger/content/virtualFolderName.xul",
"newFolder",
"chrome,titlebar,modal",
{siblingFolderURI: preselectedURI, searchFolderURIs: preselectedURI,
okCallback: okCallbackFunc, name: name});
}
function getSearchTermString(searchTerms)
{
var searchIndex;

View File

@ -681,7 +681,7 @@ function changeQuickSearchMode(aMenuItem)
function saveViewAsVirtualFolder()
{
openNewVirtualFolderDialogWithArgs(gSearchInput.value, gSearchSession);
openNewVirtualFolderDialogWithArgs(gSearchInput.value, gSearchSession.searchTerms);
}
function InitQuickSearchPopup()

View File

@ -175,7 +175,7 @@ function MsgCompactFolder(isAll)
}
}
function openNewVirtualFolderDialogWithArgs(defaultViewName, aSearchSession)
function openNewVirtualFolderDialogWithArgs(defaultViewName, aSearchTerms)
{
var folderURI = GetSelectedFolderURI();
var folderTree = GetFolderTree();
@ -185,7 +185,7 @@ function openNewVirtualFolderDialogWithArgs(defaultViewName, aSearchSession)
var dialog = window.openDialog("chrome://messenger/content/virtualFolderProperties.xul", "",
"chrome,titlebar,modal,centerscreen",
{preselectedURI:folderURI,
searchTermSession:aSearchSession,
searchTerms:aSearchTerms,
newFolderName:name});
}