From f0a647bf532779c0ccb7d6337e8f8d008d32ff8e Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com"
 <sspitzer%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 27 Dec 2000 23:04:39 +0000
Subject: [PATCH] fix all context menu for the message pane.  except for
 "Select All", none of the menu items worked.  two problems:  move
 isDocumentFrame() out to contentAreaUtils.js and move the creation of the
 contextMenu out so it wouldn't go out of scope.  r=blakeross, sr=bienvenu

git-svn-id: svn://10.0.0.236/trunk@84111 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../base/resources/content/mailContextMenus.js   |  4 +---
 .../base/resources/content/mailWindowOverlay.xul |  8 +++++++-
 .../xpfe/browser/resources/content/navigator.js  | 16 ----------------
 .../resources/content/contentAreaUtils.js        | 16 ++++++++++++++++
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/mailContextMenus.js b/mozilla/mailnews/base/resources/content/mailContextMenus.js
index e84b13fe9f4..00cb3cb7def 100644
--- a/mozilla/mailnews/base/resources/content/mailContextMenus.js
+++ b/mozilla/mailnews/base/resources/content/mailContextMenus.js
@@ -321,10 +321,8 @@ function SetMenuItemAccessKey(id, accessKey)
 
 }
 
-function fillMessagePaneContextMenu(contextMenuNode)
+function fillMessagePaneContextMenu(contextMenu)
 {
-	var contextMenu = new nsContextMenu(contextMenuNode);
-
 	var message = GetLoadedMessage();
 	var numSelected = (message) ? 1 : 0;
 
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 495bafc35b1..02b2771b4d0 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -32,6 +32,12 @@ Rights Reserved.
   xmlns:nc="http://home.netscape.com/NC-rdf#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+<!-- Context menu -->
+<script language="javascript">
+  // Global variable that holds the nsContextMenu instance.
+  var contextMenu = null;
+</script>
+
 <script src="chrome://messenger/content/mailCommands.js"/>
 <script src="chrome://messenger/content/mailWindowOverlay.js"/>
 
@@ -386,7 +392,7 @@ Rights Reserved.
 	</popup>
 
 	<popup id="messagePaneContext"   
-	 oncreate="return fillMessagePaneContextMenu(this);" 
+	 oncreate="contextMenu = new nsContextMenu(this); return fillMessagePaneContextMenu(contextMenu);" 
 	 ondestroy="contextMenu.onDestroy(); contextMenu = null;">
         <menuitem id="context-openlink"
                   value="&openLinkCmd.label;"
diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js
index 5b45c972ef9..4e037d58c2d 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.js
+++ b/mozilla/xpfe/browser/resources/content/navigator.js
@@ -93,22 +93,6 @@ function contentAreaFrameFocus()
   }
 }
 
-/**
- * Determine whether or not a given focused DOMWindow is in the content
- * area.
- **/
-function isDocumentFrame(aFocusedWindow)
-{
-  var contentFrames = _content.frames;
-  if (contentFrames.length) {
-    for (var i = 0; i < contentFrames.length; ++i) {
-      if (aFocusedWindow == contentFrames[i])
-        return true;
-    }
-  }
-  return false;
-}
-
 //////////////////////////////// BOOKMARKS ////////////////////////////////////
 
 function UpdateBookmarksLastVisitedDate(event)
diff --git a/mozilla/xpfe/communicator/resources/content/contentAreaUtils.js b/mozilla/xpfe/communicator/resources/content/contentAreaUtils.js
index 3712918dfdb..83604a81691 100644
--- a/mozilla/xpfe/communicator/resources/content/contentAreaUtils.js
+++ b/mozilla/xpfe/communicator/resources/content/contentAreaUtils.js
@@ -21,6 +21,22 @@
  * 
  */
 
+/**
+ * Determine whether or not a given focused DOMWindow is in the content
+ * area.
+ **/
+  function isDocumentFrame(aFocusedWindow)
+  {
+    var contentFrames = _content.frames;
+    if (contentFrames.length) {
+      for (var i = 0; i < contentFrames.length; ++i) {
+        if (aFocusedWindow == contentFrames[i])
+          return true;
+      }
+    }
+    return false;
+  }
+
   function openNewWindowWith( url ) {
 
  // URL Loading Security Check