Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adding fixes that when into the branch for search

Browse Source
This commit is contained in:
matt%netscape.com 2000-03-18 00:38:45 +00:00
parent 2ccf927736
commit c0c8073897
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xpfe/browser/resources/content/navigator.js
View File

@ -463,7 +463,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
var searchEngineURI = null;
var autoOpenSearchPanel = false;
var defaultSearchURL = null;
var fallbackDefaultSearchURL = "http://info.netscape.com/fwd/sidb1dnet/http://search.netscape.com/cgi-bin/search?search="
try
{
searchMode = pref.GetIntPref("browser.search.powermode");
@ -475,23 +475,22 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
catch(ex)
{
}
dump("Search defaultSearchURL: " + defaultSearchURL + "\n");
if ((defaultSearchURL == null) || (defaultSearchURL == ""))
{
// Fallback to a Netscape default (one that we can get sidebar search results for)
// defaultSearchURL = "http://search.netscape.com/cgi-bin/search?search=";
defaultSearchURL = "http://info.netscape.com/fwd/sidb1dnet/http://search.netscape.com/cgi-bin/search?search=";
defaultSearchURL = fallbackDefaultSearchURL;
}
if (window.content.location.href == searchStr)
dump("This is before the search " + window.content.location.href + "\n");
dump("This is before the search " + searchStr + "\n");
if ((window.content.location.href == searchStr) || (searchStr == ''))
{
dump(searchStr + ' Search: ' + defaultSearchURL + '\n');
if (!(defaultSearchURL == "http://search.netscape.com/cgi-bin/search?search=")) {
if (!(defaultSearchURL == fallbackDefaultSearchURL)) {
window.content.location.href = defaultSearchURL;
}
else
{
window.content.location.href = "http://search.netscape.com/"
window.content.location.href = "http://info.netscape.com/fwd/6_0b1/http://search.netscape.com/"
}
}
else

10
xpfe/browser/resources/content/navigatorOverlay.xul
View File

@ -305,15 +305,15 @@ END of Deprecated -->
<menupopup id="searchMenu">
<menuitem value="&findOnCmd.label;" oncommand="BrowserFind();"/>
<menuitem value="&findAgainCmd.label;" oncommand="BrowserFindAgain();"/>
<menuseparator />
<menuseparator />
<menuitem value="&searchInternetCmd.label;"
oncommand="OpenSearch('internet', true, null);"/>
oncommand="openTopWin('http://home.netscape.com/bookmark/6_0b1/ssearch.html')"/>
<menuitem value="&searchAllMailCmd.label;"
oncommand="OpenSearch('mail', true, null);"/>
disabled="true" oncommand=""/>
<menuitem value="&searchBookmarksHistoryCmd.label;"
oncommand="OpenSearch('find', true, null);"/>
disabled="true" oncommand=""/>
<menuitem value="&searchAddressbookCmd.label;"
oncommand="OpenSearch('addressbook', true, null);"/>
disabled="true" oncommand=""/>
<!-- <menuseparator />
Commenting out of beta. Not in Spec
<menuitem value="&searchComputerCmd.label;"