Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#92473 Overwrite character set does not work inside Text and Textarea.

Browse Source 
r = radha, sr=blizzard


git-svn-id: svn://10.0.0.236/trunk@101156 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
shanjian%netscape.com 2001-08-16 00:33:58 +00:00
parent ea219971a6
commit ba3583e6ab
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/docshell/base/nsDocShell.cpp
View File

@ -3558,6 +3558,7 @@ nsDocShell::Embed(nsIContentViewer * aContentViewer,
// Determine if this type of load should update history
switch (mLoadType) {
case LOAD_RELOAD_CHARSET_CHANGE: //don't perserve history in charset reload
case LOAD_NORMAL_REPLACE:
case LOAD_RELOAD_BYPASS_CACHE:
case LOAD_RELOAD_BYPASS_PROXY:

2
mozilla/xpfe/browser/resources/content/navigator.js
View File

@ -788,7 +788,7 @@ function BrowserSetForcedCharacterSet(aCharset)
var docCharset = getBrowser().docShell.QueryInterface(
Components.interfaces.nsIDocCharset);
docCharset.charset = aCharset;
BrowserReload();
BrowserReloadWithFlags(nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
}
function BrowserSetForcedDetector()

6
mozilla/xpfe/components/shistory/src/nsSHistory.cpp
View File

@ -483,7 +483,11 @@ nsSHistory::Reload(PRUint32 aReloadFlags)
{
loadType = nsIDocShellLoadInfo::loadReloadBypassCache;
}
else
else if (aReloadFlags & nsIWebNavigation::LOAD_FLAGS_CHARSET_CHANGE)
{
loadType = nsIDocShellLoadInfo::loadReloadCharsetChange;
}
else
{
loadType = nsIDocShellLoadInfo::loadReloadNormal;
}