summaryrefslogtreecommitdiffstats
path: root/application/palemoon/base/content/browser.js
diff options
context:
space:
mode:
authorNew Tobin Paradigm <email@mattatobin.com>2018-04-13 13:21:09 -0400
committerGitHub <noreply@github.com>2018-04-13 13:21:09 -0400
commit314016db7f55d24ad9d23197ca56462e78bc9ecc (patch)
tree1bdd6ad32474a6ff8eaae6fd1348c56b58ffeacc /application/palemoon/base/content/browser.js
parent4f82d4067af9e65dbfd33f3a8b445affddc7ced4 (diff)
parent96e396f3455e7d955d6907b3e57260aaa0ac2369 (diff)
downloadUXP-314016db7f55d24ad9d23197ca56462e78bc9ecc.tar
UXP-314016db7f55d24ad9d23197ca56462e78bc9ecc.tar.gz
UXP-314016db7f55d24ad9d23197ca56462e78bc9ecc.tar.lz
UXP-314016db7f55d24ad9d23197ca56462e78bc9ecc.tar.xz
UXP-314016db7f55d24ad9d23197ca56462e78bc9ecc.zip
Merge pull request #142 from janekptacijarabaci/pm_devtools_3_developer-toolbar
Fix: Developer Toolbar (the command: "cookie"; themes)
Diffstat (limited to 'application/palemoon/base/content/browser.js')
-rw-r--r--application/palemoon/base/content/browser.js12
1 files changed, 12 insertions, 0 deletions
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index cdf139bbb..6af11af3d 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -722,6 +722,14 @@ var gBrowserInit = {
window.addEventListener("AppCommand", HandleAppCommandEvent, true);
+ // These routines add message listeners. They must run before
+ // loading the frame script to ensure that we don't miss any
+ // message sent between when the frame script is loaded and when
+ // the listener is registered.
+#ifdef MOZ_DEVTOOLS
+ DevToolsTheme.init();
+#endif
+
messageManager.loadFrameScript("chrome://browser/content/content.js", true);
messageManager.loadFrameScript("chrome://browser/content/content-sessionStore.js", true);
@@ -1281,6 +1289,10 @@ var gBrowserInit = {
ToolbarIconColor.uninit();
+#ifdef MOZ_DEVTOOLS
+ DevToolsTheme.uninit();
+#endif
+
var enumerator = Services.wm.getEnumerator(null);
enumerator.getNext();
if (!enumerator.hasMoreElements()) {