fix for bug 39764 (disabled values added to context menu). check the target of the oncreate/destroy event before processing it, as this will bubble from submenus. r=brade.

editor/ui/composer/content/EditorContextMenu.js

@@ -20,8 +20,11 @@
  *
  */
 
-function fillContentContextMenu(contextMenuNode)
+function fillContentContextMenu(event, contextMenuNode)
 {
+  if ( event.target != contextMenuNode )
+    return;
+   
 	contextMenu = new nsContextMenu(contextMenuNode);
 
   HideDisabledItem("menu_undo_cm");
@@ -40,8 +43,11 @@ function fillContentContextMenu(contextMenuNode)
   ShowMenuItem("tableMenu-separator", ShowTableMenuSeparator());
 }
 
-function cleanupContextMenu( contextMenuNode )
+function cleanupContextMenu( event, contextMenuNode )
 {
+  if ( event.target != contextMenuNode )
+    return;
+
   ShowHiddenItemOnCleanup("menu_undo_cm");
   ShowHiddenItemOnCleanup("menu_redo_cm");
   ShowHiddenItemOnCleanup("menu_cut_cm");

editor/ui/composer/content/EditorContextMenuOverlay.xul

@@ -34,8 +34,8 @@
 
 <popupset id="editorContentContextSet">
  <popup id="editorContentContext"   
-   oncreate="return fillContentContextMenu(this);" 
-	 ondestroy="cleanupContextMenu(this); contextMenu.onDestroy(); contextMenu = null;">
+   oncreate="return fillContentContextMenu(event, this);" 
+	 ondestroy="cleanupContextMenu(event, this); contextMenu.onDestroy(); contextMenu = null;">
 		<menuitem id="menu_undo_cm" observes="cmd_undo"/>
 		<menuitem id="menu_redo_cm" observes="cmd_redo"/>
 		<menuseparator id="undoredo-separator"/>