diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-08-27 17:38:27 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-08-27 17:38:27 -0400 |
| commit | 0d41385344e5ccf782197798c663e2d9fc26f8d7 (patch) | |
| tree | cf4c925f9695a4d6f44b7f8793ba59a19b2fd83c /phpBB/styles/subsilver2/template | |
| parent | dc9a7714734f9ce69e1e83a80cf40445c59761bf (diff) | |
| parent | e0bb46c852638ed22281cff88a425e6ec983f17a (diff) | |
| download | forums-0d41385344e5ccf782197798c663e2d9fc26f8d7.tar forums-0d41385344e5ccf782197798c663e2d9fc26f8d7.tar.gz forums-0d41385344e5ccf782197798c663e2d9fc26f8d7.tar.bz2 forums-0d41385344e5ccf782197798c663e2d9fc26f8d7.tar.xz forums-0d41385344e5ccf782197798c663e2d9fc26f8d7.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympus
* nickvergessen/ticket/10253:
[ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
Diffstat (limited to 'phpBB/styles/subsilver2/template')
| -rw-r--r-- | phpBB/styles/subsilver2/template/editor.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js index cd22812bab..7cc5de9034 100644 --- a/phpBB/styles/subsilver2/template/editor.js +++ b/phpBB/styles/subsilver2/template/editor.js @@ -151,8 +151,10 @@ function insert_text(text, spaces, popup) { text = ' ' + text + ' '; } - - if (!isNaN(textarea.selectionStart)) + + // Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way. + // Therefore we simply add a !is_ie here until IE fixes the text-selection completely. + if (!isNaN(textarea.selectionStart) && !is_ie) { var sel_start = textarea.selectionStart; var sel_end = textarea.selectionEnd; @@ -218,11 +220,12 @@ function addquote(post_id, username, l_wrote) } // Get text selection - not only the post content :( - if (window.getSelection) + // IE9 must use the document.selection method but has the *.getSelection so we just force no IE + if (window.getSelection && !is_ie) { theSelection = window.getSelection().toString(); } - else if (document.getSelection) + else if (document.getSelection && !is_ie) { theSelection = document.getSelection(); } |