Adding search logic to url bar r=bill 24582

This commit is contained in:
matt%netscape.com 2006-09-14 05:44:12 +00:00
Родитель b8e47eaf4d
Коммит 3d3412f5eb
1 изменённых файлов: 51 добавлений и 36 удалений

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

@ -527,6 +527,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
autoOpenSearchPanel = pref.GetBoolPref("browser.search.opensidebarsearchpanel");
searchEngineURI = pref.CopyCharPref("browser.search.defaultengine");
defaultSearchURL = pref.CopyCharPref("browser.search.defaulturl");
}
catch(ex)
{
@ -538,6 +539,19 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
defaultSearchURL = "http://search.netscape.com/cgi-bin/search?search=";
}
if (window.content.location.href == searchStr)
{
dump(searchStr + ' Search: ' + defaultSearchURL + '\n');
if (!(defaultSearchURL == "http://search.netscape.com/cgi-bin/search?search=")) {
window.content.location.href = defaultSearchURL;
}
else
{
window.content.location.href = "http://search.netscape.com/"
}
}
else
{
if ((searchMode == 1) || (forceDialogFlag == true))
{
// Use a single search dialog
@ -586,6 +600,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
}
window.content.location.href = defaultSearchURL;
}
}
// should we try and open up the sidebar to show the "Search Results" panel?
if (autoOpenSearchPanel == true)