mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Proper 3.5b4 fix for Zotero.File.getCharsetFromFile()

Browse source
This commit is contained in:
Dan Stillman 2009-05-06 07:07:47 +00:00
parent 6802b70036
commit 0ab3f1d2d6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/xpcom/file.js
View file

@ -240,9 +240,6 @@ Zotero.File = new function(){
.getURLSpecFromFile(file); .getURLSpecFromFile(file);
this.addCharsetListener(browser, function (charset, args) { this.addCharsetListener(browser, function (charset, args) {
// ignore spurious about:blank loads
if(browser.contentDocument.location.href == "about:blank") return;
callback(charset, args); callback(charset, args);
Zotero.Browser.deleteHiddenBrowser(browser); Zotero.Browser.deleteHiddenBrowser(browser);
}, args); }, args);
@ -273,6 +270,9 @@ Zotero.File = new function(){
} }
var onpageshow = function(){ var onpageshow = function(){
// ignore spurious about:blank loads
if(browser.contentDocument.location.href == "about:blank") return;
browser.removeEventListener("pageshow", onpageshow, false); browser.removeEventListener("pageshow", onpageshow, false);
var charset = browser.contentDocument.characterSet; var charset = browser.contentDocument.characterSet;