summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-06-26 13:56:27 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-06-26 13:56:27 -0400
commitbaf849c626e3633105f1cdfefa991e1aa41f0071 (patch)
tree34c1f2d1af54abebf64eff17e9971f7bf3b742c3
parent02d374dbe66a17f5942e0148b9dfda780a4b1f56 (diff)
downloadUXP-baf849c626e3633105f1cdfefa991e1aa41f0071.tar
UXP-baf849c626e3633105f1cdfefa991e1aa41f0071.tar.gz
UXP-baf849c626e3633105f1cdfefa991e1aa41f0071.tar.lz
UXP-baf849c626e3633105f1cdfefa991e1aa41f0071.tar.xz
UXP-baf849c626e3633105f1cdfefa991e1aa41f0071.zip
Revert "Make the Error Console accessible from about:console"
This reverts commit bbbb74e5f077b47c6adb8ede13bfb001bb966cdb.
-rw-r--r--docshell/base/nsAboutRedirector.cpp1
-rw-r--r--docshell/build/nsDocShellModule.cpp1
-rw-r--r--toolkit/components/console/content/console.xul13
3 files changed, 7 insertions, 8 deletions
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
index 4dba7f261..a50134cec 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 3481bd297..91b35abea 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 9233fef96..0abd0a981 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>