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

partial fix for 32034 - sidebar search doesnt work from mail

Browse Source
This commit is contained in:
ben%netscape.com 2000-08-31 07:52:32 +00:00
parent 974cb5781d
commit c1f9dff58d
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xpfe/components/search/resources/search-panel.js
View File

@ -624,6 +624,7 @@ function doSearch()
// hide various columns
var navWindow = getNavigatorWindow();
dump("*** navWindow = " + navWindow + "\n");
if( navWindow._content.isMozillaSearchWindow )
{
colNode = navWindow._content.document.getElementById("RelevanceColumn");
@ -1084,16 +1085,20 @@ function loadURLInContent(url)
// retrieves the most recent navigator window
function getNavigatorWindow()
{
const WM_PROGID = "component://netscape/rdf/datasource?name=window-mediator";
var wm;
if (top.document) {
var possibleNavigator = top.document.getElementById("main-window");
if (possibleNavigator &&
possibleNavigator.getAttribute("windowtype") == "navigator:browser")
return top;
else return openNewNavigator();
else {
wm = nsJSComponentManager.getService(WM_PROGID, "nsIWindowMediator");
return wm ? wm.getMostRecentWindow("navigator:browser") : openNewNavigator();
}
}
else {
const WM_PROGID = "component://netscape/rdf/datasource?name=window-mediator";
var wm = nsJSComponentManager.getService(WM_PROGID, "nsIWindowMediator");
wm = nsJSComponentManager.getService(WM_PROGID, "nsIWindowMediator");
return wm ? wm.getMostRecentWindow("navigator:browser") : openNewNavigator();
}
}
@ -1107,7 +1112,9 @@ function getNavigatorWindowAppCore()
function openNewNavigator()
{
return openDialog(search_getBrowserURL(), "_blank", "chrome,all,dialog=no");
var newNavigator = open(search_getBrowserURL(), "_blank", "chrome,all,dialog=no");
dump("*** newNavigator - " + newNavigator + "\n");
return newNavigator;
}
function search_getBrowserURL()

1
xpfe/components/search/resources/search-panel.xul
View File

@ -34,6 +34,7 @@
onunload="SearchPanelShutdown();">
<script language="Javascript" src="chrome://global/content/strres.js"></script>
<script language="Javascript" src="chrome://global/content/nsJSComponentManager.js"></script>
<script language="Javascript" src="chrome://communicator/content/search/search-panel.js"></script>
<script language="Javascript" src="chrome://communicator/content/search/shared.js"></script>