From a5d6d0c1100931a24bb16549ebcc4974e765a3e3 Mon Sep 17 00:00:00 2001
From: "BlakeR1234%aol.com" <BlakeR1234%aol.com>
Date: Thu, 24 Aug 2000 23:51:44 +0000
Subject: [PATCH] Fix bug 35233, Stop on the context menu needs to be disabled
 at the appropriate times. r=jrgm a=brendan

---
 xpfe/browser/resources/content/navigator.js     | 5 +++++
 xpfe/browser/resources/content/nsContextMenu.js | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index b372d606fafa..36bce9ba3b72 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -60,6 +60,7 @@ catch (ex)
   var throbberElement = null;
   var stopButton = null;
   var stopMenu = null;
+  var stopContext = null;
   var locationFld = null;
   var backButton	= null;
   var forwardButton = null;
@@ -286,6 +287,8 @@ nsXULBrowserWindow.prototype =
       stopButton = document.getElementById("stop-button");
     if(!stopMenu)
       stopMenu = document.getElementById("menuitem-stop");
+    if(!stopContext)
+      stopContext = document.getElementById("context-stop");
 
     if (state & Components.interfaces.nsIWebProgressListener.flag_start) {
       if(state & Components.interfaces.nsIWebProgressListener.flag_is_network) {
@@ -298,6 +301,7 @@ nsXULBrowserWindow.prototype =
         // XXX: These need to be based on window activity...    
         stopButton.setAttribute("disabled", false);
         stopMenu.setAttribute("disabled", false);
+        stopContext.setAttribute("disabled", false);
 
         // Initialize the progress stuff...
         statusMeter.setAttribute("mode","undetermined");
@@ -336,6 +340,7 @@ nsXULBrowserWindow.prototype =
         // XXX: These need to be based on window activity...
         stopButton.setAttribute("disabled", true);
         stopMenu.setAttribute("disabled", true);
+        stopContext.setAttribute("disabled", true);
 
         EnableBusyCursor(false);
       }
diff --git a/xpfe/browser/resources/content/nsContextMenu.js b/xpfe/browser/resources/content/nsContextMenu.js
index 2b974d02ad1f..76506bf8e971 100644
--- a/xpfe/browser/resources/content/nsContextMenu.js
+++ b/xpfe/browser/resources/content/nsContextMenu.js
@@ -95,8 +95,8 @@ nsContextMenu.prototype = {
         this.showItem( "context-reload", !this.inFrame );
         this.showItem( "context-reload-frame", this.inFrame );
     
-        // Stop determined by canStop broadcaster.
-        this.setItemAttrFromNode( "context-stop", "disabled", "canStop" );
+        // XXX: Stop is determined in navigator.js; the canStop broadcaster is broken
+        //this.setItemAttrFromNode( "context-stop", "disabled", "canStop" );
     },
     initSaveItems : function () {
         // Save page is always OK, unless in directory listing.