summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-06-26 14:02:33 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-06-26 14:02:33 -0400
commit015922d371376b5171bc2a5aa72cb69100ef6806 (patch)
treee79144a36efbe3e983c9967c43e0fcbbc2f269a9
parentbaf849c626e3633105f1cdfefa991e1aa41f0071 (diff)
downloadUXP-015922d371376b5171bc2a5aa72cb69100ef6806.tar
UXP-015922d371376b5171bc2a5aa72cb69100ef6806.tar.gz
UXP-015922d371376b5171bc2a5aa72cb69100ef6806.tar.lz
UXP-015922d371376b5171bc2a5aa72cb69100ef6806.tar.xz
UXP-015922d371376b5171bc2a5aa72cb69100ef6806.zip
Make the Error Console accessible from about:console and make it presentable in that context
-rw-r--r--docshell/base/nsAboutRedirector.cpp1
-rw-r--r--docshell/build/nsDocShellModule.cpp1
-rw-r--r--toolkit/components/console/content/console.xul11
3 files changed, 5 insertions, 8 deletions
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
index a50134cec..4dba7f261 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 91b35abea..3481bd297 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 0abd0a981..90b900cf9 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>