diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-02-04 01:06:25 +0000 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-02-04 01:06:25 +0000 |
| commit | dec3e2f728bb5fb344c0098b6a8b909495d2d662 (patch) | |
| tree | 82e2e33b4fe5164c07fb776ea6cdc74740a687c0 | |
| parent | 20301d6b9f78732ac4bde379a3db847435192e81 (diff) | |
| download | forums-dec3e2f728bb5fb344c0098b6a8b909495d2d662.tar forums-dec3e2f728bb5fb344c0098b6a8b909495d2d662.tar.gz forums-dec3e2f728bb5fb344c0098b6a8b909495d2d662.tar.bz2 forums-dec3e2f728bb5fb344c0098b6a8b909495d2d662.tar.xz forums-dec3e2f728bb5fb344c0098b6a8b909495d2d662.zip | |
Merge r10472 and r10474 into the 3.0.7 branch
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10475 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/editor.js | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/editor.js | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9f6b886932..43f4311600 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -153,6 +153,7 @@ <li>[Fix] Fix language string for PM-Reports refering to post-data. (Bug #54745)</li> <li>[Fix] Do not store email templates in database. (Bug #54505)</li> <li>[Fix] Fix javascript bug in the smilies ACP. (Bug #55725)</li> + <li>[Fix] Unify BBCode Selection across browsers. (Bug #38765)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 1699f783d5..98dab5d7c8 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -323,8 +323,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; diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js index b4a426df4e..0c48c93ad3 100644 --- a/phpBB/styles/subsilver2/template/editor.js +++ b/phpBB/styles/subsilver2/template/editor.js @@ -276,8 +276,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; |