diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-07-26 13:25:13 -0500 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-07-26 13:29:53 -0500 |
| commit | 488030543607b23940cd97ecc44fba047174173d (patch) | |
| tree | f547dc4248ca30ce1ca54fa98e770f71dde93834 /phpBB/adm | |
| parent | fc25fe694afdab683789c9ed962c77558f85796c (diff) | |
| download | forums-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/adm')
| -rw-r--r-- | phpBB/adm/style/editor.js | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index 7e3ce1c708..217aa699e2 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -46,7 +46,11 @@ function initInsertions() { textarea.focus(); baseHeight = doc.selection.createRange().duplicate().boundingHeight; - // document.body.focus(); + + if (!document.forms[form_name]) + { + document.body.focus(); + } } } @@ -230,6 +234,7 @@ function addquote(post_id, username) theSelection = theSelection.replace(/<\;/ig, '<'); theSelection = theSelection.replace(/>\;/ig, '>'); theSelection = theSelection.replace(/&\;/ig, '&'); + theSelection = theSelection.replace(/ \;/ig, ' '); } else if (document.all) { @@ -273,8 +278,8 @@ function mozWrap(txtarea, open, close) var s3 = (txtarea.value).substring(selEnd, selLength); txtarea.value = s1 + open + s2 + close + s3; - txtarea.selectionStart = selEnd + open.length + close.length; - txtarea.selectionEnd = txtarea.selectionStart; + txtarea.selectionStart = selStart + open.length; + txtarea.selectionEnd = selEnd + open.length; txtarea.focus(); txtarea.scrollTop = scrollTop; @@ -327,8 +332,8 @@ function colorPalette(dir, width, height) for (b = 0; b < 5; b++) { color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); - document.write('<td bgcolor="#' + color + '">'); - document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" onmouseover="helpline(\'s\');" onmouseout="helpline(\'tip\');"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>'); + document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">'); + document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>'); document.writeln('</td>'); } |