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

fix frame handling

Browse source
This commit is contained in:
Simon Kornblith 2009-01-11 10:08:53 +00:00
parent 3c00572990
commit 4f467568fb
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
chrome/content/zotero/browser.js
View file

@ -360,22 +360,31 @@ var Zotero_Browser = new function() {
* called to unregister Zotero icon, etc. * called to unregister Zotero icon, etc.
*/ */
function contentHide(event) { function contentHide(event) {
if(event.originalTarget instanceof HTMLDocument && !event.originalTarget.defaultView.frameElement) { if(event.originalTarget instanceof HTMLDocument) {
// Get root document if this is a frameset
var doc = event.originalTarget; var doc = event.originalTarget;
var rootDoc = doc;
while(rootDoc.defaultView.frameElement) {
rootDoc = rootDoc.defaultView.frameElement.ownerDocument;
}
// Figure out what browser this contentDocument is associated with // Figure out what browser this contentDocument is associated with
var browser; var browser;
for(var i=0; i<this.tabbrowser.browsers.length; i++) { for(var i=0; i<this.tabbrowser.browsers.length; i++) {
if(doc == this.tabbrowser.browsers[i].contentDocument) { if(rootDoc == this.tabbrowser.browsers[i].contentDocument) {
browser = this.tabbrowser.browsers[i]; browser = this.tabbrowser.browsers[i];
break; break;
} }
} }
// clear data object
var tab = _getTabObject(browser); var tab = _getTabObject(browser);
if(!tab) return; if(!tab) return;
tab.clear(); if(doc == tab.page.document || doc == rootDoc) {
// clear translator only if the page on which the pagehide event was called is
// either the page to which the translator corresponded, or the root document
// (the second check is probably paranoid, but won't hurt)
tab.clear();
}
// update status // update status
if(this.tabbrowser.selectedBrowser == browser) { if(this.tabbrowser.selectedBrowser == browser) {
@ -581,11 +590,8 @@ Zotero_Browser.Tab.prototype.detectTranslators = function(rootDoc, doc) {
// if there's already a scrapable page in the browser window, and it's // if there's already a scrapable page in the browser window, and it's
// still there, ensure it is actually part of the page, then return // still there, ensure it is actually part of the page, then return
if(this.page.translators && this.page.translators.length && this.page.document.location) { if(this.page.translators && this.page.translators.length && this.page.document.location) {
if(this._searchFrames(rootDoc, this.page.document)) { if(this._searchFrames(rootDoc, this.page.document)) return;
return; this.clear();
} else {
this.page.document = null;
}
} }
if(doc instanceof HTMLDocument && doc.documentURI.substr(0, 6) != "about:") { if(doc instanceof HTMLDocument && doc.documentURI.substr(0, 6) != "about:") {