makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympus

Browse source 
* nickvergessen/ticket/10253:
  [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
This commit is contained in:
Oleg Pudeyev 2011-08-27 17:38:27 -04:00
commit 0d41385344
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/styles/prosilver/template/editor.js
View file

@ -151,8 +151,10 @@ function insert_text(text, spaces, popup)
{ {
text = ' ' + text + ' '; 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_start = textarea.selectionStart;
var sel_end = textarea.selectionEnd; var sel_end = textarea.selectionEnd;
@ -216,11 +218,12 @@ function addquote(post_id, username, l_wrote)
} }
// Get text selection - not only the post content :( // 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(); theSelection = window.getSelection().toString();
} }
else if (document.getSelection) else if (document.getSelection && !is_ie)
{ {
theSelection = document.getSelection(); theSelection = document.getSelection();
} }

2
phpBB/styles/prosilver/template/forum_fn.js
View file

@ -200,7 +200,7 @@ function selectCode(a)
// Get ID of code block // Get ID of code block
var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0]; var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0];
// Not IE // Not IE and IE9+
if (window.getSelection) if (window.getSelection)
{ {
var s = window.getSelection(); var s = window.getSelection();

11
phpBB/styles/subsilver2/template/editor.js
View file

@ -151,8 +151,10 @@ function insert_text(text, spaces, popup)
{ {
text = ' ' + text + ' '; 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_start = textarea.selectionStart;
var sel_end = textarea.selectionEnd; var sel_end = textarea.selectionEnd;
@ -218,11 +220,12 @@ function addquote(post_id, username, l_wrote)
} }
// Get text selection - not only the post content :( // 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(); theSelection = window.getSelection().toString();
} }
else if (document.getSelection) else if (document.getSelection && !is_ie)
{ {
theSelection = document.getSelection(); theSelection = document.getSelection();
} }