aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2010-07-26 13:25:13 -0500
committerJosh Woody <a_jelly_doughnut@phpbb.com>2010-07-26 13:29:53 -0500
commit488030543607b23940cd97ecc44fba047174173d (patch)
treef547dc4248ca30ce1ca54fa98e770f71dde93834 /phpBB/styles/prosilver
parentfc25fe694afdab683789c9ed962c77558f85796c (diff)
downloadforums-488030543607b23940cd97ecc44fba047174173d.tar
forums-488030543607b23940cd97ecc44fba047174173d.tar.gz
forums-488030543607b23940cd97ecc44fba047174173d.tar.bz2
forums-488030543607b23940cd97ecc44fba047174173d.tar.xz
forums-488030543607b23940cd97ecc44fba047174173d.zip
[ticket/9499] Unify definition of dE() and other javascript functions
dE() was defined differently in the ACP and in prosilver. Other javascript in editor.js files has also been unified (taking the prosilver implementation as cannonical) PHPBB3-9499
Diffstat (limited to 'phpBB/styles/prosilver')
-rw-r--r--phpBB/styles/prosilver/template/forum_fn.js13
1 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 6fb3778952..4a85858df5 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -98,16 +98,21 @@ function viewableArea(e, itself)
/**
* Set display of page element
* s[-1,0,1] = hide,toggle display,show
+* type = string: inline, block, inline-block or other CSS "display" type
*/
-function dE(n, s)
+function dE(n, s, type)
{
- var e = document.getElementById(n);
+ if (!type)
+ {
+ type = 'block';
+ }
+ var e = document.getElementById(n);
if (!s)
{
- s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
+ s = (e.style.display == '' || e.style.display == type) ? -1 : 1;
}
- e.style.display = (s == 1) ? 'block' : 'none';
+ e.style.display = (s == 1) ? type : 'none';
}
/**