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

This commit is contained in:
Simon Kornblith 2011-05-19 22:48:26 +00:00
parent 51f8c11ea0
commit 12efce8786

View file

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