From 50a6dacb14562370750245afc6133620b006ff0f Mon Sep 17 00:00:00 2001
From: "cmanske%netscape.com" <cmanske%netscape.com>
Date: Tue, 29 Jan 2002 00:56:08 +0000
Subject: [PATCH] Fixed busted 'New' command in Composer, b=121939, r=brade,
 sr=hewitt

---
 editor/ui/composer/content/editor.xul         |  1 +
 .../content/editorApplicationOverlay.js       | 36 ++++++++-----------
 .../content/editorNavigatorOverlay.xul        |  2 +-
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/editor/ui/composer/content/editor.xul b/editor/ui/composer/content/editor.xul
index 912425c1a0b4..601821f9b5f5 100644
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -66,6 +66,7 @@
   <script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
   <script type="application/x-javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
   <script type="application/x-javascript" src="chrome://editor/content/EditorContextMenu.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/editorApplicationOverlay.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
diff --git a/editor/ui/composer/content/editorApplicationOverlay.js b/editor/ui/composer/content/editorApplicationOverlay.js
index 30bfb9cdbc8f..f2e136097f1b 100644
--- a/editor/ui/composer/content/editorApplicationOverlay.js
+++ b/editor/ui/composer/content/editorApplicationOverlay.js
@@ -37,28 +37,6 @@
 
 /* Implementations of nsIControllerCommand for composer commands */
 
-function editLink(aLinkURL)
-{
-  urlSecurityCheck(aLinkURL, window.document);  // XXX what is this? Why do we pass the chrome doc?
-  editPage(aLinkURL, window, false);
-}
-
-// XXX Cleanup needed here! Specifically:
-//     1) rename this function to |editPage|
-//     2) move |editPage| from utilityOverlay.js into this file, as well as any UI that uses it
-//        (which, at time of writing, is:
-//         * view source "edit page" menu item
-//         * navigator "edit page" menu item
-//         * "Open in Composer" item in Open Location dialog
-//        |editPage| should be renamed |editURL|
-function overlay_editPage(aDocument)      
-{
-  if (!aDocument)
-    aDocument = window._content.document;
-  
-  editPage(aDocument.URL, window, false); 
-}
-
 function initEditorContextMenuItems(aEvent)
 {
   var shouldShowEditPage = !gContextMenu.onImage && !gContextMenu.onLink && !gContextMenu.onTextInput && !gContextMenu.inDirList;
@@ -79,6 +57,20 @@ function initEditorContextMenuListener(aEvent)
 
 addEventListener("load", initEditorContextMenuListener, false);
 
+function editLink(aLinkURL)
+{
+  urlSecurityCheck(aLinkURL, window.document);  // XXX what is this? Why do we pass the chrome doc?
+  editPage(aLinkURL, window, false);
+}
+
+function editDocument(aDocument)      
+{
+  if (!aDocument)
+    aDocument = window._content.document;
+  
+  editPage(aDocument.URL, window, false); 
+}
+
 function editPageOrFrame()
 {
   var url;
diff --git a/editor/ui/composer/content/editorNavigatorOverlay.xul b/editor/ui/composer/content/editorNavigatorOverlay.xul
index b7cdbf78111b..932b50075c73 100644
--- a/editor/ui/composer/content/editorNavigatorOverlay.xul
+++ b/editor/ui/composer/content/editorNavigatorOverlay.xul
@@ -28,7 +28,7 @@
     <menuitem id="context-editpage"
               label="&editPageCmd.label;"
               accesskey="&editPageCmd.accesskey;"
-              oncommand="overlay_editPage(gContextMenu.target.ownerDocument);"
+              oncommand="editDocument(gContextMenu.target.ownerDocument);"
               insertafter="context-sep-save"/>
     <menuitem id="context-editlink"
               label="&editLinkCmd.label;"