diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-31 02:10:00 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-31 02:10:00 +0200 |
| commit | f179987f6468c6ded301bbb95871d1591b00b98f (patch) | |
| tree | 98cffa84fb26000a54a8c69b5be1adf899504032 /phpBB/adm | |
| parent | ccb4182d2906b00a3fdce2790656aace5bdc2c9d (diff) | |
| parent | 488030543607b23940cd97ecc44fba047174173d (diff) | |
| download | forums-f179987f6468c6ded301bbb95871d1591b00b98f.tar forums-f179987f6468c6ded301bbb95871d1591b00b98f.tar.gz forums-f179987f6468c6ded301bbb95871d1591b00b98f.tar.bz2 forums-f179987f6468c6ded301bbb95871d1591b00b98f.tar.xz forums-f179987f6468c6ded301bbb95871d1591b00b98f.zip | |
Merge branch 'ticket/jellydoughnut/9499' into develop-olympus
* ticket/jellydoughnut/9499:
[ticket/9499] Unify definition of dE() and other javascript functions
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>'); } |