summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-07-26 10:54:18 +0000
committeralecpl <alec@alec.pl>2011-07-26 10:54:18 +0000
commit909a3acb83c66aafa545eb086921a422a69cfabe (patch)
tree9acb0884ce691520eb96daecbad02d0b2a1c0bf0 /program/include
parent71e8cc3bce5053ca986a95ef119101d15317ddc6 (diff)
- Move console object initialization code into one place
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_html_page.php8
-rwxr-xr-xprogram/include/rcube_template.php7
2 files changed, 10 insertions, 5 deletions
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index 0cceb8964..200233c5d 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -219,12 +219,12 @@ class rcube_html_page
}
}
- if (!empty($this->scripts['foot'])) {
- $page_footer .= sprintf($this->script_tag, $this->scripts['foot']);
+ if (!empty($this->footer)) {
+ $page_footer .= $this->footer . "\n";
}
- if (!empty($this->footer)) {
- $page_footer .= $this->footer;
+ if (!empty($this->scripts['foot'])) {
+ $page_footer .= sprintf($this->script_tag, $this->scripts['foot']);
}
// find page header
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index a4c1a6915..a672c5058 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -428,10 +428,15 @@ class rcube_template extends rcube_html_page
if ($write) {
// add debug console
if ($this->config['debug_level'] & 8) {
- $this->add_footer('<div id="console" style="position:absolute;top:5px;left:5px;width:405px;padding:2px;background:white;z-index:9000;">
+ $this->add_footer('<div id="console" style="position:absolute;top:5px;left:5px;width:405px;padding:2px;background:white;z-index:9000;display:none">
<a href="#toggle" onclick="con=$(\'#dbgconsole\');con[con.is(\':visible\')?\'hide\':\'show\']();return false">console</a>
<textarea name="console" id="dbgconsole" rows="20" cols="40" wrap="off" style="display:none;width:400px;border:none;font-size:10px" spellcheck="false"></textarea></div>'
);
+ $this->add_script(
+ "if (!window.console || !window.console.log) {\n".
+ " window.console = new rcube_console();\n".
+ " $('#console').show();\n".
+ "}", 'foot');
}
$this->write(trim($output));
}