suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A better way of getting browser and window in proxy.js

Browse Source
This commit is contained in:
Simon Kornblith 2011-05-19 22:48:26 +00:00
parent 51f8c11ea0
commit 12efce8786
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chrome/content/zotero/xpcom/proxy.js
View File

@ -398,16 +398,9 @@ Zotero.Proxies = new function() {
* @return {Array} Array containing a browser object and a DOM window object * @return {Array} Array containing a browser object and a DOM window object
*/ */
function _getBrowserAndWindow(notificationCallbacks) { function _getBrowserAndWindow(notificationCallbacks) {
try { var browser = notificationCallbacks.getInterface(Ci.nsIWebNavigation)
var pageDOMDocument = notificationCallbacks.getInterface(Components.interfaces.nsIDOMWindow).top.document; .QueryInterface(Ci.nsIDocShell).chromeEventHandler;
if(!pageDOMDocument) return false; var window = browser.ownerDocument.defaultView;
var enumerator = windowMediator.getZOrderDOMWindowEnumerator("navigator:browser", true);
while(enumerator.hasMoreElements()) {
var window = enumerator.getNext();
browser = window.gBrowser.getBrowserForDocument(pageDOMDocument);
if(browser) break;
}
} catch(e) {}
return [browser, window]; return [browser, window];
} }