Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 18:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugzilla 56564, r=matt, sr=alecf, revert code from bugscape 2666 and use

Browse Source 
string bundle for "third" search URL
This commit is contained in:
pchen%netscape.com 2000-10-19 22:42:17 +00:00
parent dca0647bab
commit 669d675d27
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,7 +716,8 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
var searchEngineURI = null; var searchEngineURI = null;
var autoOpenSearchPanel = false; var autoOpenSearchPanel = false;
var defaultSearchURL = null; var defaultSearchURL = null;
var fallbackDefaultSearchURL = bundle.GetStringFromName("fallbackDefaultSearchURL") var fallbackDefaultSearchURL = bundle.GetStringFromName("fallbackDefaultSearchURL");
var otherSearchURL = bundle.GetStringFromName("otherSearchURL");
try try
{ {
@ -743,15 +744,24 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
// Call in to BrowserAppCore instead of replacing // Call in to BrowserAppCore instead of replacing
// the url in the content area so that B/F buttons work right // the url in the content area so that B/F buttons work right
// There used to be an 'if' case to see if defaultSearchURL == fallbackDefaultSearchURL if (!(defaultSearchULR == fallbackDefaultURL))
// and if so, call appCore.loadUrl("http://search.netscape.com/"). {
// Removed 'if' case, set fallbackDefaultSearchURL to "http://search.netscape.com/" and if (appCore)
// always use defaultSearchURL. I assert that this new way of handling things is appCore.loadUrl(defaultSearchURL);
// functionally equivalent to the old way. else
if (appCore) dump("BrowserAppCore is not initialised\n");
appCore.loadUrl(defaultSearchURL); }
else else
dump("BrowserAppCore is not initialised\n"); {
//window._content.local.href = "http://home.netscape.com/bookmark/6_0/tsearch.html"
// Call in to BrowserAppCore instead of replacing
// the url in the content area so that B/F buttons work right
if (appCore)
appCore.loadUrl(otherSearchURL);
else
dump("BrowserAppCore is not initialised\n");
}
} }
else else
{ {