Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some support for various search modes when using the "Search" button.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@56618 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rjc%netscape.com 1999-12-30 11:10:19 +00:00
parent b237e4724e
commit f4f075da11
2 changed files with 90 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mozilla/suite/browser/navigator.js
View File

@ -879,9 +879,52 @@ function createBrowserInstance()
function OpenSearch(tabName, searchStr)
{
dump("OpenSearch searchStr: '" + searchStr + "'\n\n");
var searchMode = 0;
var searchEngineURI = null;
try
{
searchMode = pref.GetIntPref("browser.search.powermode");
searchEngineURI = pref.CopyCharPref("browser.search.defaultengine");
}
catch(ex)
{
searchMode = 0;
}
if (searchMode == 1)
{
dump("Power Search: '" + searchStr + "'\n");
window.openDialog("chrome://search/content/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr);
}
else
{
dump("Search: '" + searchStr + "'\n");
if ((!searchStr) || (searchStr == "")) return;
dump("Default Engine URL: '" + searchEngineURI + "'\n");
window.openDialog("chrome://search/content/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr);
var escapedSearchStr = escape(searchStr);
// default to Netscape unless another search engine was selected
var defaultSearchURL = "http://search.netscape.com/cgi-bin/search?search=" + escapedSearchStr;
if ((searchEngineURI != null) && (searchEngineURI != ""))
{
try
{
var searchURL = null;
var searchDS = Components.classes["component://netscape/rdf/datasource?name=internetsearch"].getService();
if (searchDS) searchDS = searchDS.QueryInterface(Components.interfaces.nsIInternetSearchService);
if (searchDS) searchURL = searchDS.GetInternetSearchURL(searchEngineURI, escapedSearchStr);
if ((searchURL != null) && (searchURL != ""))
{
defaultSearchURL = searchURL;
}
}
catch(ex)
{
}
}
window.content.location.href = defaultSearchURL;
}
}
function BrowserNewWindow()

47
mozilla/xpfe/browser/resources/content/navigator.js
View File

@ -879,9 +879,52 @@ function createBrowserInstance()
function OpenSearch(tabName, searchStr)
{
dump("OpenSearch searchStr: '" + searchStr + "'\n\n");
var searchMode = 0;
var searchEngineURI = null;
try
{
searchMode = pref.GetIntPref("browser.search.powermode");
searchEngineURI = pref.CopyCharPref("browser.search.defaultengine");
}
catch(ex)
{
searchMode = 0;
}
if (searchMode == 1)
{
dump("Power Search: '" + searchStr + "'\n");
window.openDialog("chrome://search/content/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr);
}
else
{
dump("Search: '" + searchStr + "'\n");
if ((!searchStr) || (searchStr == "")) return;
dump("Default Engine URL: '" + searchEngineURI + "'\n");
window.openDialog("chrome://search/content/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr);
var escapedSearchStr = escape(searchStr);
// default to Netscape unless another search engine was selected
var defaultSearchURL = "http://search.netscape.com/cgi-bin/search?search=" + escapedSearchStr;
if ((searchEngineURI != null) && (searchEngineURI != ""))
{
try
{
var searchURL = null;
var searchDS = Components.classes["component://netscape/rdf/datasource?name=internetsearch"].getService();
if (searchDS) searchDS = searchDS.QueryInterface(Components.interfaces.nsIInternetSearchService);
if (searchDS) searchURL = searchDS.GetInternetSearchURL(searchEngineURI, escapedSearchStr);
if ((searchURL != null) && (searchURL != ""))
{
defaultSearchURL = searchURL;
}
}
catch(ex)
{
}
}
window.content.location.href = defaultSearchURL;
}
}
function BrowserNewWindow()