From b855f3824cfde06d14afa248098d5b0794c3b771 Mon Sep 17 00:00:00 2001
From: "law%netscape.com" <law%netscape.com>
Date: Fri, 23 Jun 2000 22:49:05 +0000
Subject: [PATCH] Bug 31578; add 'Reload Frame' to context menu;
 r=matt@netscape.com

---
 xpfe/browser/resources/content/navigator.xul      | 6 +++++-
 xpfe/browser/resources/content/nsContextMenu.js   | 8 +++++++-
 xpfe/browser/resources/locale/en-US/navigator.dtd | 3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index d6398abe4730..58f5b92a158b 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -131,8 +131,12 @@ Contributor(s): ______________________________________. -->
                   oncommand="BrowserForward()"/>
         <menuitem id="context-reload"
                   value="&reloadCmd.label;"
-                  accesskey=""
+                  accesskey="&reloadCmd.accesskey;"
                   oncommand="BrowserReallyReload(0);"/>
+        <menuitem id="context-reload-frame"
+                  value="&reloadFrameCmd.label;"
+                  accesskey="&reloadFrameCmd.accesskey;"
+                  oncommand="contextMenu.reloadFrame();"/>
         <menuitem id="context-stop"
                   value="&stopCmd.label;"
                   accesskey=""
diff --git a/xpfe/browser/resources/content/nsContextMenu.js b/xpfe/browser/resources/content/nsContextMenu.js
index d498af60994e..b56557417ebb 100644
--- a/xpfe/browser/resources/content/nsContextMenu.js
+++ b/xpfe/browser/resources/content/nsContextMenu.js
@@ -88,7 +88,9 @@ nsContextMenu.prototype = {
         // Forward determined by canGoForward broadcaster.
         this.setItemAttrFromNode( "context-forward", "disabled", "canGoForward" );
     
-        // Reload is always OK.
+        // Reload is OK if not on a frame; vice-versa for reload-frame.
+        this.showItem( "context-reload", !this.inFrame );
+        this.showItem( "context-reload-frame", this.inFrame );
     
         // Stop determined by canStop broadcaster.
         this.setItemAttrFromNode( "context-stop", "disabled", "canStop" );
@@ -301,6 +303,10 @@ nsContextMenu.prototype = {
     editLink : function () {
         BrowserEditPage( this.linkURL() );
     },
+    // Reload clicked-in frame.
+    reloadFrame : function () {
+        this.target.ownerDocument.location.reload();
+    },
     // Open clicked-in frame in its own window.
     openFrame : function () {
         openNewWindowWith( this.target.ownerDocument.location.href );
diff --git a/xpfe/browser/resources/locale/en-US/navigator.dtd b/xpfe/browser/resources/locale/en-US/navigator.dtd
index 31a5d93e25c9..dd979355a15f 100644
--- a/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -329,6 +329,9 @@
 <!ENTITY editLinkCmd.accesskey        "e">
 <!ENTITY openFrameCmd.label           "Open Frame in New Window">
 <!ENTITY openFrameCmd.accesskey       "o">
+<!ENTITY reloadCmd.accesskey          "r">
+<!ENTITY reloadFrameCmd.label         "Reload Frame">
+<!ENTITY reloadFrameCmd.accesskey     "r">
 <!ENTITY viewPageSourceCmd.label      "View Page Source">
 <!ENTITY viewPageSourceCmd.accesskey  "v">
 <!ENTITY viewFrameSourceCmd.label     "View Frame Source">