From 66635c44c66fe139a90cd44f68e42ce74f92e10b Mon Sep 17 00:00:00 2001 From: gorhill Date: Sat, 1 Apr 2017 12:13:29 -0400 Subject: [PATCH] fix warning on older firefox versions --- platform/firefox/bootstrap.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/platform/firefox/bootstrap.js b/platform/firefox/bootstrap.js index 3f4660547..e53bf08da 100644 --- a/platform/firefox/bootstrap.js +++ b/platform/firefox/bootstrap.js @@ -31,6 +31,8 @@ const {classes: Cc, interfaces: Ci} = Components; // Accessing the context of the background page: // var win = Services.appShell.hiddenDOMWindow.document.querySelector('iframe[src*=ublock0]').contentWindow; +let windowlessBrowser = null; +let windowlessBrowserPL = null; let bgProcess = null; let version; const hostName = 'ublock0'; @@ -86,9 +88,6 @@ function createBgProcess(parentDocument) { ); } -let windowlessBrowser; -let windowlessBrowserPL; - function getWindowlessBrowserFrame(appShell) { windowlessBrowser = appShell.createWindowlessBrowser(true); windowlessBrowser.QueryInterface(Ci.nsIInterfaceRequestor); @@ -98,7 +97,7 @@ function getWindowlessBrowserFrame(appShell) { QueryInterface: XPCOMUtils.generateQI([ Ci.nsIWebProgressListener, Ci.nsIWebProgressListener2, Ci.nsISupportsWeakReference]), - onStateChange(wbp, request, stateFlags, status) { + onStateChange(wbp, request, stateFlags/*, status*/) { if ( !request ) { return; } @@ -189,7 +188,10 @@ function shutdown(data, reason) { } if ( windowlessBrowser !== null ) { - windowlessBrowser.close(); + // close() does not exist for older versions of Firefox. + if ( typeof windowlessBrowser.close === 'function' ) { + windowlessBrowser.close(); + } windowlessBrowser = null; windowlessBrowserPL = null; }