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

Bug 252802: Stop manual searches from popping open the sidebar. r=jag, sr=neil

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@211587 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ajschult%verizon.net 2006-09-14 06:11:23 +00:00
parent c3ee1d41d2
commit c70a6f7676
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,26 +331,13 @@ function HandleBookmarkIcon(iconURL, addFlag)
function UpdateInternetSearchResults(event)
{
var url = getWebNavigation().currentURI.spec;
if (url) {
try {
var autoOpenSearchPanel =
pref.getBoolPref("browser.search.opensidebarsearchpanel");
if (url && isSearchPanelOpen())
{
if (!gSearchService)
gSearchService = Components.classes["@mozilla.org/rdf/datasource;1?name=internetsearch"]
.getService(Components.interfaces.nsIInternetSearchService);
if (autoOpenSearchPanel || isSearchPanelOpen())
{
if (!gSearchService)
gSearchService = Components.classes["@mozilla.org/rdf/datasource;1?name=internetsearch"]
.getService(Components.interfaces.nsIInternetSearchService);
var searchInProgressFlag = gSearchService.FindInternetSearchResults(url);
if (searchInProgressFlag) {
if (autoOpenSearchPanel)
RevealSearchPanel();
}
}
} catch (ex) {
}
gSearchService.FindInternetSearchResults(url);
}
}

8
mozilla/suite/browser/urlbarBindings.xml
View File

@ -162,8 +162,14 @@
<method name="getOverrideValue">
<body><![CDATA[
if (this.mSearchBox.selectedIndex != null)
if (this.mSearchBox.selectedIndex != null) {
try {
if (pref.getBoolPref("browser.search.opensidebarsearchpanel"))
RevealSearchPanel();
} catch (ex) {
}
return this.mSearchBox.getOverrideValue();
}
return null;
]]></body>
</method>