From a13657175548bc5cb174cc42d521287d2bebd024 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com"
 <blakeross%telocity.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 14 Oct 2000 03:40:41 +0000
Subject: [PATCH] Fix 25592 - implement "open frame in this whole window"
 functionality and add an item to the context menu. r=law sr=shaver

git-svn-id: svn://10.0.0.236/trunk@81195 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/browser/resources/content/navigator.xul      | 4 ++++
 mozilla/xpfe/browser/resources/content/nsContextMenu.js   | 5 +++++
 mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index b8c1d8c0b0c..bef388a46d8 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -126,6 +126,10 @@ Contributor(s): ______________________________________. -->
                   value="&openFrameCmd.label;"
                   accesskey=""
                   oncommand="contextMenu.openFrame();"/>
+        <menuitem id="context-showonlythisframe"
+                  value="&showOnlyThisFrameCmd.label;"
+                  accesskey="&showOnlyThisFrameCmd.accesskey;"
+                  oncommand="contextMenu.showOnlyThisFrame();"/>
         <menuseparator id="context-sep-open"/>
         <!-- Navigation ============================== -->
         <menuitem id="context-back"
diff --git a/mozilla/xpfe/browser/resources/content/nsContextMenu.js b/mozilla/xpfe/browser/resources/content/nsContextMenu.js
index 12e08412676..811aad01ce5 100644
--- a/mozilla/xpfe/browser/resources/content/nsContextMenu.js
+++ b/mozilla/xpfe/browser/resources/content/nsContextMenu.js
@@ -81,6 +81,7 @@ nsContextMenu.prototype = {
     
         // Remove open frame if not applicable.
         this.showItem( "context-openframe", this.inFrame );
+        this.showItem( "context-showonlythisframe", this.inFrame );
     
         // Remove separator after open items if neither link nor frame.
         this.showItem( "context-sep-open", this.onSaveableLink || ( this.inDirList && this.onLink ) || this.inFrame );
@@ -387,6 +388,10 @@ nsContextMenu.prototype = {
     openFrame : function () {
         openNewWindowWith( this.target.ownerDocument.location.href );
     },
+    // Open clicked-in frame in the same window
+    showOnlyThisFrame : function () {
+        window._content.location.href = this.target.ownerDocument.location.href;
+    },
     // Open new "view source" window with the frame's URL.
     viewFrameSource : function () {
     window.openDialog(  "chrome://navigator/content/viewSource.xul",
diff --git a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
index 0cf9c723628..ba37a4dff2f 100644
--- a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -320,6 +320,8 @@
 <!ENTITY editLinkCmd.accesskey        "e">
 <!ENTITY openFrameCmd.label           "Open Frame in New Window">
 <!ENTITY openFrameCmd.accesskey       "o">
+<!ENTITY showOnlyThisFrameCmd.label           "Show Only This Frame">
+<!ENTITY showOnlyThisFrameCmd.accesskey       "w">
 <!ENTITY reloadCmd.accesskey          "r">
 <!ENTITY reloadCmd.commandKey         "r">
 <!ENTITY reloadFrameCmd.label         "Reload Frame">