From 8c668d775415552e8e04afb4a02ac8f0d064bb0e Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Sep 2006 06:08:12 +0000
Subject: [PATCH] Bug 85908 Add reload to View Page Source Window r=doron sr=bz

git-svn-id: svn://10.0.0.236/trunk@211396 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/browser/viewSourceOverlay.xul |  6 ++++++
 mozilla/suite/browser/viewsource.js         | 21 ++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/mozilla/suite/browser/viewSourceOverlay.xul b/mozilla/suite/browser/viewSourceOverlay.xul
index e41eb505466..da15850e65d 100644
--- a/mozilla/suite/browser/viewSourceOverlay.xul
+++ b/mozilla/suite/browser/viewSourceOverlay.xul
@@ -103,7 +103,11 @@
     <key keycode="&findPrevCmd.commandkey2;"  command="Browser:FindPrev"  modifiers="shift"/>
     <key id="key_findTypeText"/>
 
+    <!-- View Menu -->
+    <key id="key_reload"  key="&reloadCmd.commandkey;" oncommand="BrowserReload();" modifiers="accel"/>
+    <key key="&reloadCmd.commandkey;" oncommand="BrowserReloadSkipCache();" modifiers="accel,shift"/>
     <keyset id="viewZoomKeys"/>
+    <keyset id="navigationKeys"/>
   </keyset>
 
   <!-- context menu -->
@@ -171,6 +175,8 @@
 
       <menu id="menu_View">
         <menupopup>
+          <menuitem accesskey="&reloadCmd.accesskey;" key="key_reload" label="&reloadCmd.label;" oncommand="BrowserReload();"/>
+          <menuseparator />
           <menu id="menu_textZoom"/>  
           <menuseparator/>
 <!--      <menuitem key="key_viewInfo" observes="View:PageInfo"
diff --git a/mozilla/suite/browser/viewsource.js b/mozilla/suite/browser/viewsource.js
index b8a174ae987..fcaf5ffcdfb 100644
--- a/mozilla/suite/browser/viewsource.js
+++ b/mozilla/suite/browser/viewsource.js
@@ -209,21 +209,28 @@ function ViewSourceClose()
   window.close();
 }
 
+function BrowserReload()
+{
+  // Reload will always reload from cache which is probably not what's wanted
+  BrowserReloadSkipCache();
+}
+
+function BrowserReloadSkipCache()
+{
+  const webNavigation = getBrowser().webNavigation;
+  webNavigation.reload(webNavigation.LOAD_FLAGS_BYPASS_PROXY | webNavigation.LOAD_FLAGS_BYPASS_CACHE);
+}
+
 // Strips the |view-source:| for editPage()
 function ViewSourceEditPage()
 {
-  var url = window._content.location.href;
-  url = url.substring(12,url.length);
-  editPage(url,window, false);
+  editPage(window.content.location.href.substring(12), window, false);
 }
 
 // Strips the |view-source:| for saveURL()
 function ViewSourceSavePage()
 {
-  var url = window._content.document.location.href;
-  url = url.substring(12,url.length);
-
-  saveURL(url, null, "SaveLinkTitle");
+  saveURL(window.content.location.href.substring(12), null, "SaveLinkTitle");
 }
 
 function ViewSourceGoToLine()