Proper 3.5b4 fix for Zotero.File.getCharsetFromFile()
This commit is contained in:
parent
6802b70036
commit
0ab3f1d2d6
1 changed files with 3 additions and 3 deletions
|
@ -240,9 +240,6 @@ Zotero.File = new function(){
|
|||
.getURLSpecFromFile(file);
|
||||
|
||||
this.addCharsetListener(browser, function (charset, args) {
|
||||
// ignore spurious about:blank loads
|
||||
if(browser.contentDocument.location.href == "about:blank") return;
|
||||
|
||||
callback(charset, args);
|
||||
Zotero.Browser.deleteHiddenBrowser(browser);
|
||||
}, args);
|
||||
|
@ -273,6 +270,9 @@ Zotero.File = new function(){
|
|||
}
|
||||
|
||||
var onpageshow = function(){
|
||||
// ignore spurious about:blank loads
|
||||
if(browser.contentDocument.location.href == "about:blank") return;
|
||||
|
||||
browser.removeEventListener("pageshow", onpageshow, false);
|
||||
|
||||
var charset = browser.contentDocument.characterSet;
|
||||
|
|
Loading…
Reference in a new issue