Trying to get Table submenus to load from overlay (for context menus, b=43307) doesn't work for Message Composer, so 2nd level overlay (EditorCommandsOverlay.xul) is no longer used. r=sfraser

editor/jar.mn

@@ -4,7 +4,6 @@ packages/core.jar:
 	editor/content/editor.js                                 (ui/composer/content/editor.js) 
 	editor/content/ComposerCommands.js                       (ui/composer/content/ComposerCommands.js) 
 	editor/content/EditorCommandsDebug.js                    (ui/composer/content/EditorCommandsDebug.js) 
-	editor/content/EditorCommandsOverlay.xul                 (ui/composer/content/EditorCommandsOverlay.xul) 
 	editor/content/EditorContextMenu.js                      (ui/composer/content/EditorContextMenu.js) 
 	editor/content/EditorContextMenuOverlay.xul              (ui/composer/content/EditorContextMenuOverlay.xul) 
 	editor/content/EditorInitPage.html                       (ui/composer/content/EditorInitPage.html) 

editor/ui/composer/content/EditorContextMenuOverlay.xul

@@ -23,7 +23,6 @@
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://editor/content/EditorCommandsOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/editorOverlay.dtd">
 

editor/ui/composer/content/MANIFEST

@@ -27,7 +27,6 @@ TextEditorAppShell.xul
 editor.js
 ComposerCommands.js
 EditorCommandsDebug.js
-EditorCommandsOverlay.xul
 EditorContextMenu.js
 EditorContextMenuOverlay.xul
 EditorInitPage.html

editor/ui/composer/content/Makefile.in

@@ -37,7 +37,6 @@ CHROME_CONTENT = \
 		editor.js \
 		ComposerCommands.js \
 		EditorCommandsDebug.js \
-		EditorCommandsOverlay.xul \
 		EditorContextMenu.js \
 		EditorContextMenuOverlay.xul \
 		TextEditorAppShell.xul \

editor/ui/composer/content/editorOverlay.xul

@@ -523,13 +523,36 @@
     <menupopup  oncreate="EditorInitTableMenu()">
       <!-- From EditorCommandOverlay.xul (shared with context popup) -->
       <menu id="tableInsertMenu" value="&tableInsertMenu.label;" accesskey="&tableinsertmenu.accesskey;">
-        <menupopup id="tableInsertPopup"/>
+        <menupopup>
+          <menuitem value="&insertTableCmd.label;"    accesskey="&tabletable.accesskey;"        observes="cmd_InsertTable"/>
+          <menuseparator />
+          <menuitem value="&tableRowAbove.label;"     accesskey="&tablerow.accesskey;"          observes="cmd_InsertRowAbove"/>
+          <menuitem value="&tableRowBelow.label;"     accesskey="&tablerowbelow.accesskey;"     observes="cmd_InsertRowBelow"/>
+          <menuseparator />
+          <menuitem value="&tableColumnBefore.label;" accesskey="&tablecolumn.accesskey;"       observes="cmd_InsertColumnBefore"/>
+          <menuitem value="&tableColumnAfter.label;"  accesskey="&tablecolumnafter.accesskey;"  observes="cmd_InsertColumnAfter"/>
+          <menuseparator />
+          <menuitem value="&tableCellBefore.label;"   accesskey="&tablecell.accesskey;"         observes="cmd_InsertCellBefore"/>
+          <menuitem value="&tableCellAfter.label;"    accesskey="&tablecellafter.accesskey;"    observes="cmd_InsertCellAfter"/>
+        </menupopup>
       </menu>
-      <menu id="tableSelectMenu" value="&tableInsertMenu.label;" accesskey="&tableselectmenu.accesskey;">
-        <menupopup id="tableSelectPopup"/>
+      <menu id="tableSelectMenu" value="&tableSelectMenu.label;" accesskey="&tableselectmenu.accesskey;">
+        <menupopup id="tableSelectPopup">
+          <menuitem id="menu_SelectTable"    value="&tableTable.label;"    accesskey="&tabletable.accesskey;"    observes="cmd_SelectTable"    />
+          <menuitem id="menu_SelectRow"      value="&tableRow.label;"      accesskey="&tablerow.accesskey;"      observes="cmd_SelectRow"      />
+          <menuitem id="menu_SelectColumn"   value="&tableColumn.label;"   accesskey="&tablecolumn.accesskey;"   observes="cmd_SelectColumn"   />
+          <menuitem id="menu_SelectCell"     value="&tableCell.label;"     accesskey="&tablecell.accesskey;"     observes="cmd_SelectCell"     />
+          <menuitem id="menu_SelectAllCells" value="&tableAllCells.label;" accesskey="&tableallcells.accesskey;" observes="cmd_SelectAllCells" />
+        </menupopup>
       </menu>
       <menu id="tableDeleteMenu" value="&tableDeleteMenu.label;" accesskey="&tabledeletemenu.accesskey;">
-        <menupopup id="tableDeletePopup"/>
+        <menupopup id="tableDeletePopup">
+          <menuitem id="menu_DeleteTable"         value="&tableTable.label;"        accesskey="&tabletable.accesskey;"          observes="cmd_DeleteTable"/>
+          <menuitem id="menu_DeleteRow"           value="&tableRows.label;"         accesskey="&tablerow.accesskey;"            observes="cmd_DeleteRow"/>
+          <menuitem id="menu_DeleteColumn"        value="&tableColumns.label;"      accesskey="&tablecolumn.accesskey;"         observes="cmd_DeleteColumn"/>
+          <menuitem id="menu_DeleteCell"          value="&tableCells.label;"        accesskey="&tablecell.accesskey;"           observes="cmd_DeleteCell"/>
+          <menuitem id="menu_DeleteCellContents"  value="&tableCellContents.label;" accesskey="&tablecellcontents.accesskey;"   observes="cmd_DeleteCellContents"/>
+        </menupopup>
       </menu>
       <menuseparator />
       <!-- menu value is set in InitTableMenu -->

editor/ui/composer/content/makefile.win

@@ -31,7 +31,6 @@ CHROME_CONTENT = \
 	.\editor.js \
 	.\ComposerCommands.js \
 	.\EditorCommandsDebug.js \
-	.\EditorCommandsOverlay.xul \
 	.\EditorContextMenu.js \
 	.\EditorContextMenuOverlay.xul \
 	.\EditorInitPage.html \