Bug 930863 - update CharsetLoadListener() to be e10s compliant.r=felipc

This commit is contained in:
Allison Naaktgeboren 2014-04-29 11:05:57 -07:00
parent f26e4e2c73
commit c9fd8c581b
2 changed files with 3 additions and 2 deletions

View File

@ -5180,7 +5180,8 @@ function UpdateCurrentCharset(target) {
}
function charsetLoadListener() {
var charset = CharsetMenu.foldCharset(window.content.document.characterSet);
let currCharset = gBrowser.selectedBrowser.characterSet;
let charset = CharsetMenu.foldCharset(currCharset);
if (charset.length > 0 && (charset != gLastBrowserCharset)) {
gPrevCharset = gLastBrowserCharset;

View File

@ -105,7 +105,7 @@
onget="return this._contentTitle"
readonly="true"/>
<field name="_characterSet">null</field>
<field name="_characterSet">""</field>
<property name="characterSet"
onget="return this._characterSet"