From 46997bd3e4c58711e164023f4101d812143585ef Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 11 Apr 2016 02:20:10 -0400
Subject: [PATCH] Fix "cannot access dead object" error at startup
This could happen if a second page was loaded quickly at startup, before
translators finished loading and detection ran on the first page.
---
chrome/content/zotero/browser.js | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/chrome/content/zotero/browser.js b/chrome/content/zotero/browser.js
index 5da833975..f06c4178c 100644
--- a/chrome/content/zotero/browser.js
+++ b/chrome/content/zotero/browser.js
@@ -294,11 +294,7 @@ var Zotero_Browser = new function() {
* An event handler called when a new document is loaded. Creates a new document
* object, and updates the status of the capture icon
*/
- var contentLoad = Zotero.Promise.coroutine(function* (event) {
- if (Zotero.Schema && Zotero.Schema.schemaUpdatePromise.isPending()) {
- yield Zotero.Schema.schemaUpdatePromise;
- }
-
+ var contentLoad = function (event) {
var doc = event.originalTarget;
var isHTML = doc instanceof HTMLDocument;
var rootDoc = (doc instanceof HTMLDocument ? doc.defaultView.top.document : doc);
@@ -369,7 +365,7 @@ var Zotero_Browser = new function() {
contentWin.haveZoteroEventListener = true;
}
}
- });
+ };
/*
* called to unregister Zotero icon, etc.
@@ -449,6 +445,8 @@ var Zotero_Browser = new function() {
* thereof of the current page
*/
this.updateStatus = Zotero.Promise.coroutine(function* () {
+ // Wait for translator initialization. This allows detection to still run on a page at startup
+ // once translators have finished loading.
if (Zotero.Schema && Zotero.Schema.schemaUpdatePromise.isPending()) {
yield Zotero.Schema.schemaUpdatePromise;
}
@@ -801,7 +799,17 @@ Zotero_Browser.Tab.prototype.clear = function() {
/*
* detects translators for this browser object
*/
-Zotero_Browser.Tab.prototype.detectTranslators = function(rootDoc, doc) {
+Zotero_Browser.Tab.prototype.detectTranslators = Zotero.Promise.coroutine(function* (rootDoc, doc) {
+ if (Zotero.Schema && Zotero.Schema.schemaUpdatePromise.isPending()) {
+ yield Zotero.Schema.schemaUpdatePromise;
+ }
+
+ // If document no longer exists after waiting for schema updates (probably because another page has
+ // been loaded), bail
+ if (Components.utils.isDeadWrapper(doc)) {
+ return;
+ }
+
if (doc instanceof HTMLDocument) {
if (doc.documentURI.startsWith("about:")) {
return;
@@ -818,7 +826,7 @@ Zotero_Browser.Tab.prototype.detectTranslators = function(rootDoc, doc) {
} else if(doc.documentURI.substr(0, 7) == "file://") {
this._attemptLocalFileImport(doc);
}
-}
+});
/*