mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection
This commit is contained in:
Andreas Fischer
2011-12-16 15:50:11 +01:00
parent c575fb33f6 f4bdfda69d
commit 93701adf02
3 changed files with 116 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
phpBB/styles/prosilver/template/editor.js
View File

@@ -28,8 +28,8 @@ function helpline(help)
/**
* Fix a bug involving the TextRange object. From
* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
*/
function initInsertions()
*/
function initInsertions()
{
var doc;
@@ -37,7 +37,7 @@ function initInsertions()
{
doc = document;
}
else
else
{
doc = opener.document;
}
@@ -60,12 +60,12 @@ function initInsertions()
* bbstyle
*/
function bbstyle(bbnumber)
{
{
if (bbnumber != -1)
{
bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
}
else
}
else
{
insert_text('[*]');
document.forms[form_name].elements[text_name].focus();
@@ -86,10 +86,14 @@ function bbfontstyle(bbopen, bbclose)
if ((clientVer >= 4) && is_ie && is_win)
{
// Get text selection
if (textarea.createTextRange && textarea.caretPos)
theSelection = document.selection.createRange().text;
if (theSelection)
{
textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
textarea.focus();
// Add tags around selection
document.selection.createRange().text = bbopen + theSelection + bbclose;
document.forms[form_name].elements[text_name].focus();
theSelection = '';
return;
}
}
@@ -100,10 +104,10 @@ function bbfontstyle(bbopen, bbclose)
theSelection = '';
return;
}
//The new position for the cursor after adding the bbcode
var caret_pos = getCaretPosition(textarea).start;
var new_pos = caret_pos + bbopen.length;
var new_pos = caret_pos + bbopen.length;
// Open tag
insert_text(bbopen + bbclose);
@@ -114,12 +118,12 @@ function bbfontstyle(bbopen, bbclose)
{
textarea.selectionStart = new_pos;
textarea.selectionEnd = new_pos;
}
}
// IE
else if (document.selection)
{
var range = textarea.createTextRange();
range.move("character", new_pos);
var range = textarea.createTextRange();
range.move("character", new_pos);
range.select();
storeCaret(textarea);
}
@@ -134,16 +138,16 @@ function bbfontstyle(bbopen, bbclose)
function insert_text(text, spaces, popup)
{
var textarea;
if (!popup)
if (!popup)
{
textarea = document.forms[form_name].elements[text_name];
}
else
}
else
{
textarea = opener.document.forms[form_name].elements[text_name];
}
if (spaces)
if (spaces)
{
text = ' ' + text + ' ';
}
@@ -161,7 +165,7 @@ function insert_text(text, spaces, popup)
}
else if (textarea.createTextRange && textarea.caretPos)
{
if (baseHeight != textarea.caretPos.boundingHeight)
if (baseHeight != textarea.caretPos.boundingHeight)
{
textarea.focus();
storeCaret(textarea);
@@ -174,7 +178,7 @@ function insert_text(text, spaces, popup)
{
textarea.value = textarea.value + text;
}
if (!popup)
if (!popup)
{
textarea.focus();
}
@@ -291,7 +295,7 @@ function split_lines(text)
do
{
var splitAt = line.indexOf(' ', 80);
if (splitAt == -1)
{
splitLines[j] = line;
@@ -319,7 +323,7 @@ function mozWrap(txtarea, open, close)
var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
if (selEnd == 1 || selEnd == 2)
if (selEnd == 1 || selEnd == 2)
{
selEnd = selLength;
}
@@ -343,17 +347,7 @@ function mozWrap(txtarea, open, close)
*/
function storeCaret(textEl)
{
var keyCode = false;
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.
var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
if ((!is_ie || !is_control_key) && (textEl.createTextRange))
if (textEl.createTextRange)
{
textEl.caretPos = document.selection.createRange().duplicate();
}
@@ -389,7 +383,7 @@ function colorPalette(dir, width, height)
{
document.writeln('<tr>');
}
for (b = 0; b < 5; b++)
{
color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
@@ -429,35 +423,36 @@ function caretPosition()
function getCaretPosition(txtarea)
{
var caretPos = new caretPosition();
// simple Gecko/Opera way
if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
if(txtarea.selectionStart || txtarea.selectionStart == 0)
{
caretPos.start = txtarea.selectionStart;
caretPos.end = txtarea.selectionEnd;
}
// dirty and slow IE way
else if (document.selection)
else if(document.selection)
{
// get current selection
var range = document.selection.createRange();
// a new selection of the whole textarea
var range_all = document.body.createTextRange();
range_all.moveToElementText(txtarea);
// calculate selection start point by moving beginning of range_all to beginning of range
var sel_start;
for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
{
{
range_all.moveStart('character', 1);
}
txtarea.sel_start = sel_start;
// we ignore the end value for IE, this is already dirty enough and we don't need it
caretPos.start = txtarea.sel_start;
caretPos.end = txtarea.sel_start;
caretPos.end = txtarea.sel_start;
}
return caretPos;