#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
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user