From 22bf05aebdfd3c6f3b80f98a18bc30b0da973647 Mon Sep 17 00:00:00 2001
From: "cmanske%netscape.com"
 <cmanske%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 20 Oct 1999 01:03:39 +0000
Subject: [PATCH] Adding menu item to start Composer from Browser debug menu as
 workaround for bug 16789 (can't start editor on command line). Also removed
 editor init page from code that's not even run?

git-svn-id: svn://10.0.0.236/trunk@51240 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/browser/navigatorOverlay.xul                  | 3 ++-
 mozilla/xpfe/bootstrap/nsAppRunner.cpp                      | 4 ++--
 mozilla/xpfe/browser/resources/content/navigatorOverlay.xul | 3 ++-
 mozilla/xpfe/global/resources/content/tasksOverlay.js       | 6 +-----
 mozilla/xpfe/global/resources/locale/tasksOverlay.dtd       | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index 05eeb06f751..082e66cba0d 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -538,7 +538,8 @@ Contributor(s): ______________________________________. -->
 
      <menuitem value="&domviewer.label;" oncommand="window.content.location.href='resource:/res/samples/rdf/DOMDataSourceViewer.xul'"/>
      <menuitem value="&browserbuster.label;" oncommand="window.content.location.href='http://komodo.mozilla.org/buster'"/>
-
+     <!-- TEMPORARY UNTIL -edit WORKS TO STARTUP COMPOSER (bug 16789) -->
+     <menuitem value="Composer with Test Page" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
      </menupopup>
   </menu>
 
diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
index a4b0c558d23..6492c7eb194 100644
--- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp
+++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
@@ -264,7 +264,7 @@ static nsresult HandleEditorStartup( nsICmdLineService* cmdLineArgs, nsIPref *pr
   {
     if (forceLaunchEditor || (cmdResult && (PL_strcmp("1",cmdResult)==0))) {
       urlstr = "chrome://editor/content/";
-      withArgs = "chrome://editor/content/EditorInitPage.html";
+      withArgs = "about:blank";
      
       OpenWindow( urlstr, withArgs.GetUnicode() );
     }
@@ -366,7 +366,7 @@ static nsresult HandleMailStartup( nsICmdLineService* cmdLineArgs, nsIPref *pref
     if (cmdResult && (PL_strcmp("1",cmdResult)==0))
     {
       urlstr = "chrome://messengercompose/content/";
-      withArgs = "chrome://editor/content/EditorInitPage.html";
+      withArgs = "about:blank";
   	  
       OpenWindow( urlstr, withArgs.GetUnicode() );
     }
diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index 05eeb06f751..082e66cba0d 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -538,7 +538,8 @@ Contributor(s): ______________________________________. -->
 
      <menuitem value="&domviewer.label;" oncommand="window.content.location.href='resource:/res/samples/rdf/DOMDataSourceViewer.xul'"/>
      <menuitem value="&browserbuster.label;" oncommand="window.content.location.href='http://komodo.mozilla.org/buster'"/>
-
+     <!-- TEMPORARY UNTIL -edit WORKS TO STARTUP COMPOSER (bug 16789) -->
+     <menuitem value="Composer with Test Page" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
      </menupopup>
   </menu>
 
diff --git a/mozilla/xpfe/global/resources/content/tasksOverlay.js b/mozilla/xpfe/global/resources/content/tasksOverlay.js
index 2b89511d53f..dc5c0ecd839 100644
--- a/mozilla/xpfe/global/resources/content/tasksOverlay.js
+++ b/mozilla/xpfe/global/resources/content/tasksOverlay.js
@@ -173,11 +173,7 @@ function CycleWindow( inType, inChromeURL )
 function toEditor()
 {
   //TODO: Find and existing editor window using CycleWindow()
-  // For now, this opens a new blank window
-//  toNewTextEditorWindow();
-
-// brade commented out above line since this gives a text editor not an html editor
-// add the following line to create editor window or call NewEditorWindow() in globalOverlay.js
+  // For now, just start a new blank document
   window.openDialog( "chrome://editor/content", "_blank", "chrome,all,dialog=no", "about:blank");
 }
 
diff --git a/mozilla/xpfe/global/resources/locale/tasksOverlay.dtd b/mozilla/xpfe/global/resources/locale/tasksOverlay.dtd
index eefc181861b..005c57c98c9 100644
--- a/mozilla/xpfe/global/resources/locale/tasksOverlay.dtd
+++ b/mozilla/xpfe/global/resources/locale/tasksOverlay.dtd
@@ -2,7 +2,7 @@
 <!ENTITY tasksMenu.label				"Tasks">
 <!ENTITY navigatorCmd.label					"Navigator">  
 <!ENTITY messengerCmd.label					"Messenger">
-<!ENTITY editorCmd.label					"Editor">
+<!ENTITY editorCmd.label					  "Composer">
 <!ENTITY textEditorCmd.label				"Plaintext Editor">
 
 <!ENTITY addressBookCmd.label				"Address Book">