Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1473160 - Move the startup and shutdown functions out of gBrowserInit;r=Gijs

Browse Source 
They don't rely on anything from that object, so simplify things and remove the
cross-file reference by making them normal functions.

MozReview-Commit-ID: 6iAjBWsO5zo

--HG--
extra : rebase_source : cf9b066bc99b116a0f39d87cf8cf366bc215883f
This commit is contained in:
Brian Grinstead 2018-07-11 06:47:19 -07:00
parent 916ffe84c9
commit d00d7afe7f
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
browser/base/content/nonbrowser-mac.js
View File

@ -5,6 +5,8 @@
/* eslint-env mozilla/browser-window */
let delayedStartupTimeoutId = null;
function OpenBrowserWindowFromDockMenu(options) {
let win = OpenBrowserWindow(options);
win.addEventListener("load", function() {
@ -16,7 +18,7 @@ function OpenBrowserWindowFromDockMenu(options) {
return win;
}
gBrowserInit.nonBrowserWindowStartup = function() {
function nonBrowserWindowStartup() {
// Disable inappropriate commands / submenus
var disabledItems = ["Browser:SavePage",
"Browser:SendLink", "cmd_pageSetup", "cmd_print", "cmd_find", "cmd_findAgain",
@ -78,34 +80,33 @@ gBrowserInit.nonBrowserWindowStartup = function() {
document.getElementById("macDockMenuNewPrivateWindow").hidden = true;
}
this._delayedStartupTimeoutId = setTimeout(this.nonBrowserWindowDelayedStartup.bind(this), 0);
};
delayedStartupTimeoutId = setTimeout(nonBrowserWindowDelayedStartup, 0);
}
gBrowserInit.nonBrowserWindowDelayedStartup = function() {
this._delayedStartupTimeoutId = null;
function nonBrowserWindowDelayedStartup() {
delayedStartupTimeoutId = null;
// initialise the offline listener
BrowserOffline.init();
// initialize the private browsing UI
gPrivateBrowsingUI.init();
}
};
gBrowserInit.nonBrowserWindowShutdown = function() {
function nonBrowserWindowShutdown() {
let dockSupport = Cc["@mozilla.org/widget/macdocksupport;1"]
.getService(Ci.nsIMacDockSupport);
dockSupport.dockMenu = null;
// If nonBrowserWindowDelayedStartup hasn't run yet, we have no work to do -
// just cancel the pending timeout and return;
if (this._delayedStartupTimeoutId) {
clearTimeout(this._delayedStartupTimeoutId);
if (delayedStartupTimeoutId) {
clearTimeout(delayedStartupTimeoutId);
return;
}
BrowserOffline.uninit();
};
}
addEventListener("load", function() { gBrowserInit.nonBrowserWindowStartup() }, false);
addEventListener("unload", function() { gBrowserInit.nonBrowserWindowShutdown() }, false);
addEventListener("load", nonBrowserWindowStartup, false);
addEventListener("unload", nonBrowserWindowShutdown, false);