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

[ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2

Browse source 
Revert
"[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey"

This reverts commit 219bdbaf70.

PHPBB3-8996
This commit is contained in:
Joas Schilling 2011-12-15 22:17:39 +01:00
parent 730d2d5d19
commit 2bf4e8d3d0
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,10 +86,14 @@ function bbfontstyle(bbopen, bbclose)
if ((clientVer >= 4) && is_ie && is_win) if ((clientVer >= 4) && is_ie && is_win)
{ {
// Get text selection // Get text selection
textarea = document.forms[form_name].elements[text_name]; theSelection = document.selection.createRange().text;
if (textarea.createTextRange && textarea.caretPos)
if (theSelection)
{ {
textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose; // Add tags around selection
document.selection.createRange().text = bbopen + theSelection + bbclose;
document.forms[form_name].elements[text_name].focus();
theSelection = '';
return; return;
} }
} }
@ -103,7 +107,7 @@ function bbfontstyle(bbopen, bbclose)
//The new position for the cursor after adding the bbcode //The new position for the cursor after adding the bbcode
var caret_pos = getCaretPosition(textarea).start; var caret_pos = getCaretPosition(textarea).start;
var new_pos = caret_pos + bbopen.length; var new_pos = caret_pos + bbopen.length;
// Open tag // Open tag
insert_text(bbopen + bbclose); insert_text(bbopen + bbclose);
@ -343,15 +347,7 @@ function mozWrap(txtarea, open, close)
*/ */
function storeCaret(textEl) function storeCaret(textEl)
{ {
var keyCode = false; if (textEl.createTextRange)
if (is_ie)
{
keyCode = (event.keyCode) ? event.keyCode : event.charCode;
}
// Did the user press Shift (16), Ctrl (17) or Alt (18)?
// If so, we do not update the caretPos, so BBCodes can still be applied correctly.
if ((!is_ie || (keyCode != 16 && keyCode != 17 && keyCode != 18)) && (textEl.createTextRange))
{ {
textEl.caretPos = document.selection.createRange().duplicate(); textEl.caretPos = document.selection.createRange().duplicate();
} }
@ -429,7 +425,7 @@ function getCaretPosition(txtarea)
var caretPos = new caretPosition(); var caretPos = new caretPosition();
// simple Gecko/Opera way // simple Gecko/Opera way
if(!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0)) if(txtarea.selectionStart || txtarea.selectionStart == 0)
{ {
caretPos.start = txtarea.selectionStart; caretPos.start = txtarea.selectionStart;
caretPos.end = txtarea.selectionEnd; caretPos.end = txtarea.selectionEnd;
@ -456,7 +452,7 @@ function getCaretPosition(txtarea)
// we ignore the end value for IE, this is already dirty enough and we don't need it // we ignore the end value for IE, this is already dirty enough and we don't need it
caretPos.start = txtarea.sel_start; caretPos.start = txtarea.sel_start;
caretPos.end = txtarea.sel_start; caretPos.end = txtarea.sel_start;
} }
return caretPos; return caretPos;