From 02d374dbe66a17f5942e0148b9dfda780a4b1f56 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 26 Jun 2018 13:55:58 -0400
Subject: Revert "Move the Error Console search box to the eval toolbar"

This reverts commit 2cdd998f8d35ad8fdcffaf8d0b006a2e180e5d18.
---
 toolkit/components/console/content/console.xul | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index d326081e1d..9233fef96e 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -85,12 +85,16 @@
       <textbox id="TextboxEval" class="toolbar" value="" onkeypress="onEvalKeyPress(event)" flex="1"/>
       <toolbarbutton id="ButtonEval" label="&evaluate.label;"
                      accesskey="&evaluate.accesskey;" oncommand="evaluateTypein()"/>
-      <textbox accesskey="&filter2.accesskey;" type="search"
-               id="Filter" oncommand="changeFilter();"/>
     </toolbar>
   </toolbox>
 
   <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/>
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
+
+  <toolbar align="center" nowindowdrag="true">
+    <label value="&filter2.label;" control="Filter"/>
+    <textbox accesskey="&filter2.accesskey;" type="search"
+             id="Filter" oncommand="changeFilter();"/>
+  </toolbar>
 </window>
-- 
cgit v1.2.3


From baf849c626e3633105f1cdfefa991e1aa41f0071 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 26 Jun 2018 13:56:27 -0400
Subject: Revert "Make the Error Console accessible from about:console"

This reverts commit bbbb74e5f077b47c6adb8ede13bfb001bb966cdb.
---
 docshell/base/nsAboutRedirector.cpp            |  1 -
 docshell/build/nsDocShellModule.cpp            |  1 -
 toolkit/components/console/content/console.xul | 13 +++++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
index 4dba7f261e..a50134cecc 100644
--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
@@ -50,7 +50,6 @@ static RedirEntry kRedirMap[] = {
     nsIAboutModule::ALLOW_SCRIPT
   },
   { "config", "chrome://global/content/config.xul", 0 },
-  { "console", "chrome://global/content/console.xul", 0 },
   {
     "credits", "http://www.palemoon.org/Contributors.shtml",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
diff --git a/docshell/build/nsDocShellModule.cpp b/docshell/build/nsDocShellModule.cpp
index 3481bd297d..91b35abea7 100644
--- a/docshell/build/nsDocShellModule.cpp
+++ b/docshell/build/nsDocShellModule.cpp
@@ -165,7 +165,6 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = {
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "buildconfig", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "checkerboard", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "config", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
-  { NS_ABOUT_MODULE_CONTRACTID_PREFIX "console", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "credits", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
 #ifdef MOZ_DEVTOOLS
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "debugging", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 9233fef96e..0abd0a9811 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -77,7 +77,6 @@
       <toolbarseparator/>
       <toolbarbutton id="Console:clear" oncommand="clearConsole();"
                      label="&clear.label;" accesskey="&clear.accesskey;"/>
-      <toolbarspring/>
     </toolbar>
 
     <toolbar class="chromeclass-toolbar" id="ToolbarEval" align="center" nowindowdrag="true">
@@ -92,9 +91,11 @@
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
 
-  <toolbar align="center" nowindowdrag="true">
-    <label value="&filter2.label;" control="Filter"/>
-    <textbox accesskey="&filter2.accesskey;" type="search"
-             id="Filter" oncommand="changeFilter();"/>
-  </toolbar>
+  <statusbar>
+    <statusbarpanel flex="1" pack="start">
+      <label value="&filter2.label;" control="Filter"/>
+      <textbox accesskey="&filter2.accesskey;" type="search"
+               id="Filter" oncommand="changeFilter();"/>
+    </statusbarpanel>
+  </statusbar>
 </window>
-- 
cgit v1.2.3


From 015922d371376b5171bc2a5aa72cb69100ef6806 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 26 Jun 2018 14:02:33 -0400
Subject: Make the Error Console accessible from about:console and make it
 presentable in that context

---
 docshell/base/nsAboutRedirector.cpp            |  1 +
 docshell/build/nsDocShellModule.cpp            |  1 +
 toolkit/components/console/content/console.xul | 11 +++--------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
index a50134cecc..4dba7f261e 100644
--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
@@ -50,6 +50,7 @@ static RedirEntry kRedirMap[] = {
     nsIAboutModule::ALLOW_SCRIPT
   },
   { "config", "chrome://global/content/config.xul", 0 },
+  { "console", "chrome://global/content/console.xul", 0 },
   {
     "credits", "http://www.palemoon.org/Contributors.shtml",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
diff --git a/docshell/build/nsDocShellModule.cpp b/docshell/build/nsDocShellModule.cpp
index 91b35abea7..3481bd297d 100644
--- a/docshell/build/nsDocShellModule.cpp
+++ b/docshell/build/nsDocShellModule.cpp
@@ -165,6 +165,7 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = {
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "buildconfig", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "checkerboard", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "config", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
+  { NS_ABOUT_MODULE_CONTRACTID_PREFIX "console", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "credits", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
 #ifdef MOZ_DEVTOOLS
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "debugging", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 0abd0a9811..90b900cf91 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -77,9 +77,12 @@
       <toolbarseparator/>
       <toolbarbutton id="Console:clear" oncommand="clearConsole();"
                      label="&clear.label;" accesskey="&clear.accesskey;"/>
+      <toolbarspring/>
     </toolbar>
 
     <toolbar class="chromeclass-toolbar" id="ToolbarEval" align="center" nowindowdrag="true">
+      <label value="&filter2.label;" control="Filter"/>
+      <textbox accesskey="&filter2.accesskey;" type="search" id="Filter" oncommand="changeFilter();"/>
       <label value="&codeEval.label;" accesskey="&codeEval.accesskey;" control="TextboxEval"/>
       <textbox id="TextboxEval" class="toolbar" value="" onkeypress="onEvalKeyPress(event)" flex="1"/>
       <toolbarbutton id="ButtonEval" label="&evaluate.label;"
@@ -90,12 +93,4 @@
   <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/>
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
-
-  <statusbar>
-    <statusbarpanel flex="1" pack="start">
-      <label value="&filter2.label;" control="Filter"/>
-      <textbox accesskey="&filter2.accesskey;" type="search"
-               id="Filter" oncommand="changeFilter();"/>
-    </statusbarpanel>
-  </statusbar>
 </window>
-- 
cgit v1.2.3