From 11c68f561c6e57115ab78c33e2eb4f16622d0fe6 Mon Sep 17 00:00:00 2001
From: "sfraser%netscape.com" <sfraser%netscape.com>
Date: Wed, 19 May 1999 23:27:34 +0000
Subject: [PATCH] Fix for bugs 4907, 5317; New blank editor window, and Edit
 Page. r akkana, kin. a chofmann.

---
 xpfe/browser/src/navigator.js  | 32 ++++++++++++++++++++++++++++++++
 xpfe/browser/src/navigator.xul |  4 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/xpfe/browser/src/navigator.js b/xpfe/browser/src/navigator.js
index f0029f47699a..53af9c8e92f3 100644
--- a/xpfe/browser/src/navigator.js
+++ b/xpfe/browser/src/navigator.js
@@ -247,6 +247,38 @@
     }
   }
 
+  function BrowserNewEditorWindow()
+  {
+    core = XPAppCoresManager.Find("toolkitCore");
+    if ( !core ) {
+        core = new ToolkitCore();
+        if ( core ) {
+            core.Init("toolkitCore");
+        }
+    }
+    if ( core ) {
+        core.ShowWindowWithArgs( "chrome://editor/content", window, "" );
+    } else {
+        dump("Error; can't create toolkitCore\n");
+    }
+  }
+  
+  function BrowserEditPage(url)
+  {
+    core = XPAppCoresManager.Find("toolkitCore");
+    if ( !core ) {
+        core = new ToolkitCore();
+        if ( core ) {
+            core.Init("toolkitCore");
+        }
+    }
+    if ( core ) {
+        core.ShowWindowWithArgs( "chrome://editor/content", window, url);
+    } else {
+        dump("Error; can't create toolkitCore\n");
+    }
+  }
+  
   function BrowserOpenWindow()
   {
     core = XPAppCoresManager.Find("toolkitCore");
diff --git a/xpfe/browser/src/navigator.xul b/xpfe/browser/src/navigator.xul
index 0e8071b8b7b3..20d2930cd1ed 100644
--- a/xpfe/browser/src/navigator.xul
+++ b/xpfe/browser/src/navigator.xul
@@ -272,14 +272,14 @@
       		<menuitem name="&newMailCmd.label;" onclick="MsgNewMessage();"/>
 		      <menuitem name="&newChatCmd.label;" onclick=""/>
 		      <separator />
-		      <menuitem name="&newBlankPageCmd.label;" onclick="BrowserNewWindow();"/>
+		      <menuitem name="&newBlankPageCmd.label;" onclick="BrowserNewEditorWindow();"/>
 		      <menuitem name="&newPageFromTemplateCmd.label;" onclick="BrowserNewWindow();"/>
 		      <menuitem name="&newPageFromDraftCmd.label;" onclick="BrowserNewWindow();"/>
     		</menu>
       <menuitem name="&openCmd.label;" onclick="BrowserOpenWindow();"/>
       <separator />
       <menuitem name="&sendPageCmd.label;" onclick="BrowserReload();"/>
-	   <menuitem name="&editPageCmd.label;" onclick="BrowserReload();" />
+	   <menuitem name="&editPageCmd.label;" onclick="BrowserEditPage(window.frames[0].frames[1].location.href);" />
 	   <separator />
       <menu name="&offlineMenu.label;">
 	      <menuitem name="&offlineGoOfflineCmd.label;" onclick="BrowserReload();"/>