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

FF3.5 fixes for attachment and file operations

Browse source
This commit is contained in:
Simon Kornblith 2009-04-30 00:52:48 +00:00
parent 9b5679fa14
commit 65cb00e26b
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -220,6 +220,9 @@ Zotero.Attachments = new function(){
var browser = Zotero.Browser.createHiddenBrowser();
var imported = false;
var onpageshow = function() {
// ignore spurious about:blank loads
if(browser.contentDocument.location.href == "about:blank") return;
// pageshow can be triggered multiple times on some pages,
// so make sure we only import once
// (https://www.zotero.org/trac/ticket/795)
@ -1164,6 +1167,9 @@ Zotero.Attachments = new function(){
var browser = Zotero.Browser.createHiddenBrowser();
var callback = function(charset, args) {
// ignore spurious about:blank loads
if(browser.contentDocument.location.href == "about:blank") return;
var charsetID = Zotero.CharacterSets.getID(charset);
if (charsetID) {
var disabled = Zotero.Notifier.disable();

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

@ -240,6 +240,9 @@ 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);