From 601999d61a1dcb256f3b3a003e7eba2ce797c0fa Mon Sep 17 00:00:00 2001
From: "shanjian%netscape.com"
 <shanjian%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 8 Oct 2002 02:15:26 +0000
Subject: [PATCH] #172402 Change auto-detection option in POST form page with
 frame will cause page be reloaded Let detector charset reload be handled the
 same way as charset reload. r=naoki, sr=alecf

git-svn-id: svn://10.0.0.236/trunk@131364 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/browser/resources/content/browser.js       | 4 +++-
 mozilla/xpfe/global/resources/content/charsetOverlay.js | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mozilla/xpfe/browser/resources/content/browser.js b/mozilla/xpfe/browser/resources/content/browser.js
index 5ed3117802c..47475e1afff 100644
--- a/mozilla/xpfe/browser/resources/content/browser.js
+++ b/mozilla/xpfe/browser/resources/content/browser.js
@@ -292,9 +292,11 @@ function BrowserSetForcedCharacterSet(aCharset)
   BrowserReloadWithFlags(nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
 }
 
-function BrowserSetForcedDetector()
+function BrowserSetForcedDetector(doReload)
 {
   getBrowser().documentCharsetInfo.forcedDetector = true;
+  if (doReload)
+    BrowserReloadWithFlags(nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
 }
 
 function BrowserFind()
diff --git a/mozilla/xpfe/global/resources/content/charsetOverlay.js b/mozilla/xpfe/global/resources/content/charsetOverlay.js
index 66381bb4455..c2e706c5665 100644
--- a/mozilla/xpfe/global/resources/content/charsetOverlay.js
+++ b/mozilla/xpfe/global/resources/content/charsetOverlay.js
@@ -4,8 +4,8 @@ function MultiplexHandler(event)
     var name = node.getAttribute('name');
 
     if (name == 'detectorGroup') {
-        SetForcedDetector();
-        SelectDetector(event, true);
+        SetForcedDetector(true);
+        SelectDetector(event, false);
     } else if (name == 'charsetGroup') {
         var charset = node.getAttribute('id');
         charset = charset.substring('charset.'.length, charset.length)
@@ -113,9 +113,9 @@ function ComposerSelectDetector(event)
     }
 }
 
-function SetForcedDetector()
+function SetForcedDetector(doReload)
 {
-    BrowserSetForcedDetector();
+    BrowserSetForcedDetector(doReload);
 }
 
 function SetForcedCharset(charset)