From 43cde2aaedfda1c975e50e0dce25f849445bb566 Mon Sep 17 00:00:00 2001
From: "cmanske%netscape.com"
 <cmanske%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 28 Mar 2001 21:16:44 +0000
Subject: [PATCH] Fixed plaintext editor bugs 69536, 69540, 69544, 69547,
 73674, 71702. r=brade, sr=kin

git-svn-id: svn://10.0.0.236/trunk@90680 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../ui/composer/content/ComposerCommands.js   |  19 +-
 .../composer/content/TextEditorAppShell.xul   | 112 ++++++-----
 mozilla/editor/ui/composer/content/editor.js  | 178 ++++++++++--------
 mozilla/editor/ui/composer/content/editor.xul |   6 +-
 .../ui/composer/content/editorOverlay.xul     |   9 +-
 5 files changed, 196 insertions(+), 128 deletions(-)

diff --git a/mozilla/editor/ui/composer/content/ComposerCommands.js b/mozilla/editor/ui/composer/content/ComposerCommands.js
index 142bc9c39e7..cfa0ababbce 100644
--- a/mozilla/editor/ui/composer/content/ComposerCommands.js
+++ b/mozilla/editor/ui/composer/content/ComposerCommands.js
@@ -190,9 +190,7 @@ function GetEditorController()
       if (!interfaceRequestor) continue;
     
       commandManager = interfaceRequestor.getInterface(Components.interfaces.nsIControllerCommandManager);
-    } catch(ex) {
-      dump("failed to get command manager number "+i+"\n");
-    }
+    } catch(ex) {}
 
     if (commandManager)
       return commandManager;
@@ -296,7 +294,9 @@ var nsSaveCommand =
     {
       FinishHTMLSource(); // In editor.js
       var doSaveAs = window.editorShell.editorDocument.location == "about:blank";
-      return window.editorShell.saveDocument(doSaveAs, false, "text/html");
+      var result = window.editorShell.saveDocument(doSaveAs, false, window.gDefaultSaveMimeType);
+      window._content.focus();
+      return result;
     }
     return false;
   }
@@ -314,7 +314,9 @@ var nsSaveAsCommand =
     if (window.editorShell)
     {
       FinishHTMLSource();
-      return window.editorShell.saveDocument(true, false, "text/html");
+      var result = window.editorShell.saveDocument(true, false, window.gDefaultSaveMimeType);
+      window._content.focus();
+      return result;
     }
     return false;
   }
@@ -332,7 +334,9 @@ var nsExportToTextCommand =
     if (window.editorShell)
     {
       FinishHTMLSource();
-      return window.editorShell.saveDocument(true, true, "text/plain");
+      var result = window.editorShell.saveDocument(true, true, "text/plain");
+      window._content.focus();
+      return result;
     }
     return false;
   }
@@ -351,7 +355,7 @@ var nsSaveAsCharsetCommand =
     window.openDialog("chrome://editor/content/EditorSaveAsCharset.xul","_blank", "chrome,close,titlebar,modal")
     if (window.ok)
     {
-      window.ok = window.editorShell.saveDocument(true, false, "text/html");
+      window.ok = window.editorShell.saveDocument(true, false, window.gDefaultSaveMimeType);
     }
     window._content.focus();
     return window.ok;
@@ -800,6 +804,7 @@ var nsPagePropertiesCommand =
   doCommand: function(aCommand)
   {
     window.openDialog("chrome://editor/content/EdPageProps.xul","_blank", "chrome,close,titlebar,modal", "");
+    window._content.focus();
   }
 };
 
diff --git a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
index 68717b7a4ee..7b8b25e18b2 100644
--- a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
@@ -24,10 +24,13 @@
   -->
 
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?> 
+<?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
-<?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/editor.dtd"> 
 
@@ -36,39 +39,52 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="TextEditorOnLoad()"
         onunload="EditorShutdown()"
-        title="Plaintext Editor"
+        onclose="return EditorCanClose()"
+        onfocus="EditorOnFocus()"
+        contenttitlesettting="true"
+        title=""
         titlemodifier="&textEditorWindow.titlemodifier;"
         titlemenuseparator="&editorWindow.titlemodifiermenuseparator;"
         windowtype="composer:text"
         align="vertical"
         width="640" height="480"
         screenX="10" screenY="10"
-        persist="screenX screenY width height"
+        persist="screenX screenY width height sizemode"
         >
 
   <script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
   <script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
   <script type="application/x-javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
+<!--
+editor.xul has these - do we need them?
+  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+-->
 
   <commands id="commands">
     <commandset id="globalEditMenuItems"/>
     <commandset id="selectEditMenuItems"/>
     <commandset id="undoEditMenuItems"/>
-  <commandset id="clipboardEditMenuItems"/>
-
+    <commandset id="clipboardEditMenuItems"/>
     <commandset id="commonEditorMenuItems"/>
     <commandset id="composerEditMenuItems"/>
     <commandset id="composerSaveMenuItems"/>    
+    <commandset id="composerMenuItems"/>
   </commands>
 
   <broadcaster id="args" value="chrome://editor/content/EditorInitPagePlain.html"/>
   <broadcaster id="canPrint"/>
   
-  <!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
+<!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs
   <broadcaster id="dialog.start" ready="false"/>
   <observes element="dialog.start" attribute="ready" onbroadcast="EditorStartup('text')"/>
-    
+ -->
+   
   <!-- broadcaster nodes are appended here from the overlays -->
   <broadcasterset id="broadcasterset">
     <broadcaster id="Editor:Throbber" busy="false"/>
@@ -77,54 +93,66 @@
   <!-- keys are appended from the overlay -->
   <keyset id="keyset"/>
 
-  <menubar id="main-menubar" class="chromeclass-menubar">
-    <menu id="fileMenu"/>
-    <menu id="editMenu"/>
+  <toolbox id="EditorToolbox">
+    <menubar id="main-menubar" class="chromeclass-menubar">
+      <menu id="fileMenu"/>
+      <menu id="editMenu"/>
 
-    <menu label="&viewMenu.label;" accesskey="&viewmenu.accesskey;">
-    <!-- id pulls in "Show Sidebar" item from sidebarOverlay -->
-    <menupopup id="menu_View_Popup">
-      <menu id="viewToolbar"/>
-      <menuseparator/>
-      <menuitem id="viewSourceMenuitem"/>
-      <menuseparator />
-      <menu id = "composerCharsetMenu" />
-    </menupopup>
-    </menu>
- 
-    <menu id="insertMenu"/>
+      <menu label="&viewMenu.label;" accesskey="&viewmenu.accesskey;">
+        <!-- id pulls in "Show Sidebar" item from sidebarOverlay -->
+        <menupopup id="menu_View_Popup">
+          <menu id="viewToolbar"/>
+          <menuseparator/>
+          <menu id = "composerCharsetMenu" />
+        </menupopup>
+      </menu>
 
-    <!-- tasks menu filled from tasksOverlay -->
-    <menu accesskey="t" id="tasksMenu"/>
+      <menu id="insertMenuPlainText"/>
 
-    <!-- DEBUG only -->
-    <menu id="debugMenu" />
-    <!-- end DEBUG only -->
-  
-    <!-- help menu filled from globalOverlay -->
-    <menu accesskey="h" id="menu_Help"/>
+      <!-- tasks menu filled from tasksOverlay -->
+      <menu accesskey="t" id="tasksMenu"/>
 
-  <spring flex="1"/>
-</menubar>
+      <!-- DEBUG only -->
+      <menu id="debugMenu" />
+      <!-- end DEBUG only -->
 
-<toolbox id="EditorToolbox">
-   <!-- toolbar filled out from editorOverlay -->
-  <toolbar class="toolbar-primary chromeclass-toolbar" id="EditToolbar" persist="collapsed">
+      <!-- help menu filled from globalOverlay -->
+      <menu accesskey="h" id="menu_Help"/>
+
+      <spring flex="1"/>
+    </menubar>
+
+     <!-- toolbar filled out from editorOverlay -->
+    <toolbar class="toolbar-primary" id="EditToolbar" persist="collapsed">
       <button id="newButton"/>
       <button id="openButton"/>
       <button id="saveButton"/>
       <spring class="separator_small"/>
       <button id="printButton"/>
-      <button id="findButton"/>
       <button id="spellingButton"/>
-
       <spring flex="1"/>
-  </toolbar>    
-</toolbox>
+    </toolbar>    
+  </toolbox>
 
-    <editor type="content-primary" id="content-frame" src="about:blank" flex="1"/>
+  <box id="sidebar-parent" flex="1">
+    <!-- From sidebarOverlay.xul -->
+    <box id="sidebar-box" class="chromeclass-extrachrome" hidden="true"/>
+    <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/>
+    <box id="appcontent" orient="vertical" flex="1">
 
-    <!-- status bar, from editorOverlay.xul -->
-    <toolbar id="taskbar" class="chromeclass-extrachrome" />
+      <editor type="content-primary" id="content-frame" src="about:blank" flex="1"/>
+
+      <statusbar id="status-bar">
+        <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
+        <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0">
+            <observes element="Editor:Throbber" attribute="busy"/>
+        </progressmeter>
+        <statusbarpanel id="statusText" label="&statusText.label;" flex="1" crop="right"/>
+      </statusbar>
+
+    </box> <!-- appcontent -->
+  </box><!-- sidebar-parent -->
+
+  <box id="taskbar" class="toolbox-bottom"/>
 
 </window>
diff --git a/mozilla/editor/ui/composer/content/editor.js b/mozilla/editor/ui/composer/content/editor.js
index 42f1f03db3e..e938eaa0453 100644
--- a/mozilla/editor/ui/composer/content/editor.js
+++ b/mozilla/editor/ui/composer/content/editor.js
@@ -69,6 +69,7 @@ var gColorObj = new Object();
 var gPrefs;
 var gDefaultTextColor = "";
 var gDefaultBackgroundColor = "";
+var gDefaultSaveMimeType = "text/html";
 
 // These must be kept in synch with the XUL <options> lists
 var gFontSizeNames = new Array("xx-small","x-small","small","medium","large","x-large","xx-large");
@@ -114,8 +115,8 @@ var DocumentStateListener =
 {
   NotifyDocumentCreated: function()
   {
-    // Call EditorSetDefaultPrefs first so it gets the default author before initing toolbars
-    EditorSetDefaultPrefs();
+    // Call EditorSetDefaultPrefsAndDoctype first so it gets the default author before initing toolbars
+    EditorSetDefaultPrefsAndDoctype();
     EditorInitToolbars();
     BuildRecentMenu(true);      // Build the recent files menu and save to prefs
 
@@ -201,17 +202,21 @@ function EditorSharedStartup()
   // set up JS-implemented commands for Text or HTML editing
   switch (editorShell.editorType)
   {
-    case "html":
-    case "htmlmail":
-      SetupHTMLEditorCommands();
-      break;
-    default:
-      dump("INVALID EDITOR TYPE: "+editorShell.editorType+"\n");
-      // Fall throught to implement just text?
-    case "text":
-    case "textmail":
-      SetupTextEditorCommands();
-      break;
+      case "html":
+      case "htmlmail":
+        SetupHTMLEditorCommands();
+        window.gDefaultSaveMimeType = "text/html";
+        break;
+      case "text":
+      case "textmail":
+        SetupTextEditorCommands();
+        window.gDefaultSaveMimeType = "text/plain";
+        break;
+      default:
+        dump("INVALID EDITOR TYPE: "+editorShell.editorType+"\n");
+        SetupTextEditorCommands();
+        window.gDefaultSaveMimeType = "text/plain";
+        break;
   }
 
   // Just for convenience
@@ -413,7 +418,7 @@ function CheckAndSaveDocument(reasonToSave, allowDontSave)
    if (result.value == 0)
    {
      // Save
-     var success = window.editorShell.saveDocument(false, false, "text/html");
+     var success = window.editorShell.saveDocument(false, false, window.gDefaultSaveMimeType);
      return success;
    }
 
@@ -513,10 +518,11 @@ function EditorSetTextProperty(property, attribute, value)
 
 function onParagraphFormatChange(paraMenuList, commandID)
 {
+  if (!paraMenuList)
+    return;
+
   var commandNode = document.getElementById(commandID);
   var state = commandNode.getAttribute("state");
-  var menuList = document.getElementById("ParagraphSelect");
-  if (!menuList) return;
 
   // force match with "normal"
   if (state == "body")
@@ -906,26 +912,35 @@ function EditorSelectColor(colorType, mouseEvent)
       //  we can let user select cell or table
       gColorObj.Type = "TableOrCell";
     }
+
+    if (useLastColor && gColorObj.LastBackgroundColor )
+      gColorObj.BackgroundColor = gColorObj.LastBackgroundColor;
+    else
+      useLastColor = false;
   }
   // Save the type we are really requesting
   colorType = gColorObj.Type;
 
-  // Avoid the JS warning
-  gColorObj.NoDefault = false;
+  if (!useLastColor)
+  {
+    // Avoid the JS warning
+    gColorObj.NoDefault = false;
 
-  // Launch the ColorPicker dialog
-  // TODO: Figure out how to position this under the color buttons on the toolbar
-  window.openDialog("chrome://editor/content/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", gColorObj);
+    // Launch the ColorPicker dialog
+    // TODO: Figure out how to position this under the color buttons on the toolbar
+    window.openDialog("chrome://editor/content/EdColorPicker.xul", "_blank", "chrome,close,titlebar,modal", "", gColorObj);
 
-  // User canceled the dialog
-  if (gColorObj.Cancel)
-    return;
+    // User canceled the dialog
+    if (gColorObj.Cancel)
+      return;
+  }
 
   if (colorType == "Text")
   {
     if (currentColor != gColorObj.TextColor)
+    {
       window.editorShell.SetTextProperty("font", "color", gColorObj.TextColor);
-
+    }
     // Update the command state (this will trigger color button update)
     goUpdateCommand("cmd_fontColor");
   }
@@ -1627,31 +1642,33 @@ function EditorInitToolbars()
   // Nothing to do now, but we might want some state updating here
 }
 
-function EditorSetDefaultPrefs()
+function EditorSetDefaultPrefsAndDoctype()
 {
-  /* only set defaults for new documents */
-  if ( window.editorShell.editorDocument.location != "about:blank" )
-    return;
-
-  var element;
   var domdoc;
   try { domdoc = window.editorShell.editorDocument; } catch (e) { dump( e + "\n"); }
   if ( !domdoc )
   {
-    dump("EditorSetDefaultPrefs: EDITOR DOCUMENT NOT FOUND\n");
+    dump("EditorSetDefaultPrefsAndDoctype: EDITOR DOCUMENT NOT FOUND\n");
     return;
   }
 
-  // doctype
-  var newdoctype = domdoc.implementation.createDocumentType("html", "-//W3C//DTD HTML 4.01 Transitional//EN","");
-  if (!domdoc.doctype)
+  var newDoc = window.editorShell.editorDocument.location == "about:blank";
+
+  // Insert a doctype element for a new doc or 
+  // if it is missing from existing doc
+  var needDoctype = newDoc ? true : !domdoc.doctype;
+
+  if ( needDoctype )
   {
+    var newdoctype = domdoc.implementation.createDocumentType("html", "-//W3C//DTD HTML 4.01 Transitional//EN","");
     domdoc.insertBefore(newdoctype, domdoc.firstChild);
   }
-  else
-  {
-    domdoc.replaceChild(newdoctype, domdoc.doctype);
-  }
+  
+  /* only set default prefs for new documents */
+  if ( !newDoc  )
+    return;
+
+  var element;
 
   // search for head; we'll need this for meta tag additions
   var headelement = 0;
@@ -1981,7 +1998,6 @@ function getColorAndSetColorWell(ColorPickerID, ColorWellID)
       colorWell.setAttribute("style", "background-color: " + color);
     }
   }
-  //TODO: Trigger UI update to get color from the current caret/selection
   return color;
 }
 
@@ -2025,38 +2041,47 @@ function RemoveInapplicableUIElements()
    // if no find, remove find ui
   if (!IsFindInstalled())
   {
-    var findMenuItem = document.getElementById("menu_find");
-    if (findMenuItem)
-      findMenuItem.setAttribute("hidden", "true");
-
-    findMenuItem = document.getElementById("menu_findnext");
-    if (findMenuItem)
-      findMenuItem.setAttribute("hidden", "true");
-
-    var replaceMenuItem = document.getElementById("menu_replace");
-    if (replaceMenuItem)
-      replaceMenuItem.setAttribute("hidden", "true");
-
-    var findSepItem  = document.getElementById("sep_find");
-    if (findSepItem)
-      findSepItem.parentNode.removeChild(findSepItem);
+    HideItem("menu_find");
+    HideItem("menu_findnext");
+    HideItem("menu_replace");
+    HideItem("menu_find");
+    RemoveItem("sep_find");
   }
 
    // if no spell checker, remove spell checker ui
   if (!IsSpellCheckerInstalled())
   {
-    var spellingButton = document.getElementById("spellingButton");
-    if (spellingButton)
-      spellingButton.setAttribute("hidden", "true");
-
-    var spellingMenuItem = document.getElementById("menu_checkspelling");
-    if (spellingMenuItem)
-      spellingMenuItem.setAttribute("hidden", "true");
-
-    var spellingSepItem  = document.getElementById("sep_checkspelling");
-    if (spellingSepItem)
-      spellingSepItem.parentNode.removeChild(spellingSepItem);
+    HideItem("spellingButton");
+    HideItem("menu_checkspelling");
+    RemoveItem("sep_checkspelling");
   }
+
+  // Remove menu items (from overlay shared with HTML editor) in PlainText editor
+  if (editorShell.editorType == "text")
+  {
+    HideItem("insertAnchor");
+    HideItem("insertImage");
+    HideItem("insertHline");
+    HideItem("insertTable");
+    HideItem("insertHTML");
+    HideItem("fileExportToText");
+    HideItem("viewFormatToolbar");
+    HideItem("viewEditModeToolbar");
+  }
+}
+
+function HideItem(id)
+{
+  var item = document.getElementById(id);
+  if (item)
+    item.setAttribute("hidden", "true");
+}
+
+function RemoveItem(id)
+{
+  var item = document.getElementById(id);
+  if (item)
+    item.parentNode.removeChild(item);
 }
 
 function GetPrefsService()
@@ -2173,7 +2198,8 @@ function goUpdateTableMenuItems(commandset)
       else if (commandID == "cmd_DeleteTable" ||
                commandID == "cmd_NormalizeTable" ||
                commandID == "cmd_editTable" ||
-               commandID == "cmd_TableOrCellColor")
+               commandID == "cmd_TableOrCellColor" ||
+               commandID == "cmd_SelectTable")
       {
         goSetCommandEnabled(commandID, enabledIfTable);
       } else {
@@ -2341,16 +2367,18 @@ function SwitchInsertCharToAnotherEditorOrClose()
     while ( enumerator.hasMoreElements()  )
     {
       var  tempWindow = enumerator.getNext();
-      if (tempWindow != window && tempWindow.editorShell &&
-          tempWindow.gIsHTMLEditor || tempWindow.editorShell.editorType == "htmlmail")
-//          tempWindow.editorShell.editorDocument.commandDispatcher.getControllerForCommand("cmd_InsertChars"))
+      if (tempWindow != window && ("editorShell" in tempWindow) && tempWindow.editorShell)
       {
-        tempWindow.InsertCharWindow = window.InsertCharWindow;
-        window.InsertCharWindow = null;
+        var type = tempWindow.editorShell.editorType;
+        if (type == "html" || type == "text" || type == "htmlmail")
+	      {
+          tempWindow.InsertCharWindow = window.InsertCharWindow;
+          window.InsertCharWindow = null;
 
-        tempWindow.InsertCharWindow.editorShell = tempWindow.editorShell;
-        tempWindow.InsertCharWindow.opener = tempWindow;
-        return;
+          tempWindow.InsertCharWindow.editorShell = tempWindow.editorShell;
+          tempWindow.InsertCharWindow.opener = tempWindow;
+          return;
+	      }
       }
     }
     // Didn't find another editor - close the dialog
diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul
index 09e62e30a2f..7fe29863a00 100644
--- a/mozilla/editor/ui/composer/content/editor.xul
+++ b/mozilla/editor/ui/composer/content/editor.xul
@@ -91,10 +91,10 @@
   <broadcaster id="args" value="chrome://editor/content/EditorInitPage.html"/>
   <broadcaster id="canPrint"/>
   
-  <!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
+  <!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs
   <broadcaster id="dialog.start" ready="false"/>
   <observes element="dialog.start" attribute="ready" onbroadcast="EditorStartup('html')"/>
-  
+-->
   <!-- command nodes are appended here from the overlays -->
   <broadcasterset id="broadcasterset">
     <broadcaster id="Editor:Throbber" busy="false"/>
@@ -233,7 +233,7 @@
       </box>
     </deck>
 
-    <box id="EditModeToolbar" hidden="true" autostretch="never" valign="middle" persist="hidden collapsed">
+    <box id="EditModeToolbar" hidden="false" autostretch="never" valign="middle" persist="hidden collapsed">
       <tabbox id="EditModeTabbox" class="tabbox-bottom" flex="1">
       <tab id="NormalModeButton"/>
         <tab id="TagModeButton"/>
diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul
index 21edaec76bc..da5a57f0c08 100644
--- a/mozilla/editor/ui/composer/content/editorOverlay.xul
+++ b/mozilla/editor/ui/composer/content/editorOverlay.xul
@@ -303,7 +303,7 @@
       <menuitem accesskey="&filesave.accesskey;"       key="savekb"         observes="cmd_save"/>
       <menuitem accesskey="&filesaveas.accesskey;"                          observes="cmd_saveAs"/>
       <menuitem accesskey="&filesaveascharset.accesskey;"                   observes="cmd_saveAsCharset"/>
-      <menuitem accesskey="&fileexporttotext.accesskey;"                    observes="cmd_exportToText"/>
+      <menuitem accesskey="&fileexporttotext.accesskey;"                    observes="cmd_exportToText" id="fileExportToText"/>
       <menuitem accesskey="&filerevert.accesskey;" observes="cmd_revert"/>
       <menuseparator/>
       <menuitem label="&previewCmd.label;"  accesskey="&filepreview.accesskey;" observes="cmd_preview"/>
@@ -374,6 +374,13 @@
     </menupopup>
   </menu>
     
+  <!-- Insert menu for PlainText editor -->
+  <menu id="insertMenuPlainText" label="&insertMenu.label;" accesskey="&insertmenu.accesskey;">
+    <menupopup>
+      <menuitem accesskey="&insertchars.accesskey;" observes="cmd_insertChars" />
+    </menupopup>
+  </menu>
+
   <!-- Format Menu -->
   <menupopup id="formatMenuPopup" oncreate="EditorInitFormatMenu()">
     <!-- Font face submenu -->