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

Move mailNavigatorOverlay out of navigatorOverlay and into navigator where it won't get overlaid onto view source, hidden window etc. b=108745 r=timeless sr=bienvenu

Browse Source
This commit is contained in:
neil%parkwaycc.co.uk 2004-05-25 22:32:36 +00:00
parent 3f8738e47f
commit 5f04f337ea
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,15 +145,11 @@
gContextMenu.showItem("context-sep-apps", gContextMenu.shouldShowSeparator("context-sep-apps")); gContextMenu.showItem("context-sep-apps", gContextMenu.shouldShowSeparator("context-sep-apps"));
} }
var gAddedMailContextMenuPopupListener = false;
function initMailContextMenuPopupListener(aEvent) function initMailContextMenuPopupListener(aEvent)
{ {
// This is really lame, but we can't seem to add a bubbling listener to the DOMWindow (!)
if (gAddedMailContextMenuPopupListener)
return;
var popup = document.getElementById("contentAreaContextMenu"); var popup = document.getElementById("contentAreaContextMenu");
popup.addEventListener("popupshowing", initMailContextMenuItems, false); if (popup)
gAddedMailContextMenuPopupListener = true; popup.addEventListener("popupshowing", initMailContextMenuItems, false);
} }
function hideMenuitems() { function hideMenuitems() {
@ -168,7 +164,7 @@
hideMenuitems(); hideMenuitems();
} }
addEventListener("load", initOverlay, true); addEventListener("load", initOverlay, false);
]]> ]]>
</script> </script>

1
xpfe/browser/resources/content/navigator.xul
View File

@ -42,6 +42,7 @@
<?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?>
<?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?> <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
<?xul-overlay href="chrome://navigator/content/mailNavigatorOverlay.xul"?>
<?xul-overlay href="chrome://navigator/content/navExtraOverlay.xul"?> <?xul-overlay href="chrome://navigator/content/navExtraOverlay.xul"?>
<?xul-overlay href="chrome://navigator/content/linkToolbarOverlay.xul"?> <?xul-overlay href="chrome://navigator/content/linkToolbarOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?> <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>

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

@ -45,7 +45,6 @@
<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?> <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
<?xul-overlay href="chrome://global/content/charsetOverlay.xul"?> <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
<?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?> <?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?>
<?xul-overlay href="chrome://navigator/content/mailNavigatorOverlay.xul"?>
<!DOCTYPE overlay [ <!DOCTYPE overlay [
<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" > <!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >

1
xpfe/browser/resources/content/viewPartialSource.xul
View File

@ -68,7 +68,6 @@
<keyset id="viewSourceKeys"/> <keyset id="viewSourceKeys"/>
<stringbundleset id="viewSource-stringbundleset"/> <stringbundleset id="viewSource-stringbundleset"/>
<popupset id="viewSourceContextSet" /> <popupset id="viewSourceContextSet" />
<popup id="contentAreaContextMenu"/>
<toolbox id="viewSource-toolbox"/> <toolbox id="viewSource-toolbox"/>

1
xpfe/browser/resources/content/viewSource.xul
View File

@ -69,7 +69,6 @@
<keyset id="viewSourceKeys"/> <keyset id="viewSourceKeys"/>
<stringbundleset id="viewSource-stringbundleset"/> <stringbundleset id="viewSource-stringbundleset"/>
<popupset id="viewSourceContextSet" /> <popupset id="viewSourceContextSet" />
<popup id="contentAreaContextMenu"/>
<toolbox id="viewSource-toolbox"/> <toolbox id="viewSource-toolbox"/>