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

git-svn-id: svn://10.0.0.236/trunk@211465 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil%parkwaycc.co.uk
2006-09-14 06:09:21 +00:00
parent 57731817c4
commit 57a42146d8
5 changed files with 4 additions and 10 deletions

View File

@@ -145,15 +145,11 @@
gContextMenu.showItem("context-sep-apps", gContextMenu.shouldShowSeparator("context-sep-apps"));
}
var gAddedMailContextMenuPopupListener = false;
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");
popup.addEventListener("popupshowing", initMailContextMenuItems, false);
gAddedMailContextMenuPopupListener = true;
if (popup)
popup.addEventListener("popupshowing", initMailContextMenuItems, false);
}
function hideMenuitems() {
@@ -168,7 +164,7 @@
hideMenuitems();
}
addEventListener("load", initOverlay, true);
addEventListener("load", initOverlay, false);
]]>
</script>

View File

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

View File

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

View File

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

View File

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