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

[ticket/8996] Also fix the BBCode bug in subsilver2 and acp

Browse source
This commit is contained in:
Joas Schilling 2011-11-12 14:59:11 +01:00
parent 219bdbaf70
commit eb1f15bc8b
3 changed files with 117 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
phpBB/adm/style/editor.js
View file

@ -84,14 +84,10 @@ function bbfontstyle(bbopen, bbclose)
if ((clientVer >= 4) && is_ie && is_win) if ((clientVer >= 4) && is_ie && is_win)
{ {
// Get text selection // Get text selection
theSelection = document.selection.createRange().text; if (textarea.createTextRange && textarea.caretPos)
if (theSelection)
{ {
// Add tags around selection textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
document.selection.createRange().text = bbopen + theSelection + bbclose; textarea.focus();
document.forms[form_name].elements[text_name].focus();
theSelection = '';
return; return;
} }
} }
@ -121,7 +117,7 @@ function bbfontstyle(bbopen, bbclose)
else if (document.selection) else if (document.selection)
{ {
var range = textarea.createTextRange(); var range = textarea.createTextRange();
range.move("character", new_pos); range.move("character", bbopen.length);
range.select(); range.select();
storeCaret(textarea); storeCaret(textarea);
} }
@ -292,7 +288,17 @@ function mozWrap(txtarea, open, close)
*/ */
function storeCaret(textEl) function storeCaret(textEl)
{ {
if (textEl.createTextRange) 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))
{ {
textEl.caretPos = document.selection.createRange().duplicate(); textEl.caretPos = document.selection.createRange().duplicate();
} }
@ -370,7 +376,7 @@ function getCaretPosition(txtarea)
var caretPos = new caretPosition(); var caretPos = new caretPosition();
// simple Gecko/Opera way // simple Gecko/Opera way
if (txtarea.selectionStart || txtarea.selectionStart == 0) if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
{ {
caretPos.start = txtarea.selectionStart; caretPos.start = txtarea.selectionStart;
caretPos.end = txtarea.selectionEnd; caretPos.end = txtarea.selectionEnd;

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

@ -86,10 +86,10 @@ 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];
if (textarea.createTextRange && textarea.caretPos) if (textarea.createTextRange && textarea.caretPos)
{ {
textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose; textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
textarea.focus();
return; return;
} }
} }
@ -351,7 +351,9 @@ function storeCaret(textEl)
// Did the user press Shift (16), Ctrl (17) or Alt (18)? // 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 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)) var is_control_key = (keyCode == 16 || keyCode == 17 || keyCode == 18);
if ((!is_ie || !is_control_key) && (textEl.createTextRange))
{ {
textEl.caretPos = document.selection.createRange().duplicate(); textEl.caretPos = document.selection.createRange().duplicate();
} }
@ -429,15 +431,14 @@ 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 (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
{ {
caretPos.start = txtarea.selectionStart; caretPos.start = txtarea.selectionStart;
caretPos.end = txtarea.selectionEnd; caretPos.end = txtarea.selectionEnd;
} }
// dirty and slow IE way // dirty and slow IE way
else if(document.selection) else if (document.selection)
{ {
// get current selection // get current selection
var range = document.selection.createRange(); var range = document.selection.createRange();

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

@ -6,8 +6,8 @@
// Startup variables // Startup variables
var imageTag = false; var imageTag = false;
var theSelection = false; var theSelection = false;
var bbcodeEnabled = true;
var bbcodeEnabled = true;
// Check for Browser & Platform for PC & IE specific bits // Check for Browser & Platform for PC & IE specific bits
// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html // More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
var clientPC = navigator.userAgent.toLowerCase(); // Get client info var clientPC = navigator.userAgent.toLowerCase(); // Get client info
@ -15,7 +15,6 @@ var clientVer = parseInt(navigator.appVersion); // Get browser version
var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1)); var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
var baseHeight; var baseHeight;
/** /**
@ -44,6 +43,7 @@ function initInsertions()
} }
var textarea = doc.forms[form_name].elements[text_name]; var textarea = doc.forms[form_name].elements[text_name];
if (is_ie && typeof(baseHeight) != 'number') if (is_ie && typeof(baseHeight) != 'number')
{ {
textarea.focus(); textarea.focus();
@ -86,14 +86,10 @@ function bbfontstyle(bbopen, bbclose)
if ((clientVer >= 4) && is_ie && is_win) if ((clientVer >= 4) && is_ie && is_win)
{ {
// Get text selection // Get text selection
theSelection = document.selection.createRange().text; if (textarea.createTextRange && textarea.caretPos)
if (theSelection)
{ {
// Add tags around selection textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
document.selection.createRange().text = bbopen + theSelection + bbclose; textarea.focus();
document.forms[form_name].elements[text_name].focus();
theSelection = '';
return; return;
} }
} }
@ -163,7 +159,6 @@ function insert_text(text, spaces, popup)
textarea.selectionStart = sel_start + text.length; textarea.selectionStart = sel_start + text.length;
textarea.selectionEnd = sel_end + text.length; textarea.selectionEnd = sel_end + text.length;
} }
else if (textarea.createTextRange && textarea.caretPos) else if (textarea.createTextRange && textarea.caretPos)
{ {
if (baseHeight != textarea.caretPos.boundingHeight) if (baseHeight != textarea.caretPos.boundingHeight)
@ -171,9 +166,9 @@ function insert_text(text, spaces, popup)
textarea.focus(); textarea.focus();
storeCaret(textarea); storeCaret(textarea);
} }
var caret_pos = textarea.caretPos; var caret_pos = textarea.caretPos;
caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text; caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
} }
else else
{ {
@ -183,7 +178,6 @@ function insert_text(text, spaces, popup)
{ {
textarea.focus(); textarea.focus();
} }
} }
/** /**
@ -279,7 +273,6 @@ function addquote(post_id, username, l_wrote)
return; return;
} }
function split_lines(text) function split_lines(text)
{ {
var lines = text.split('\n'); var lines = text.split('\n');
@ -316,7 +309,6 @@ function split_lines(text)
} }
return splitLines; return splitLines;
} }
/** /**
* From http://www.massless.org/mozedit/ * From http://www.massless.org/mozedit/
*/ */
@ -351,7 +343,17 @@ function mozWrap(txtarea, open, close)
*/ */
function storeCaret(textEl) function storeCaret(textEl)
{ {
if (textEl.createTextRange) 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))
{ {
textEl.caretPos = document.selection.createRange().duplicate(); textEl.caretPos = document.selection.createRange().duplicate();
} }
@ -429,13 +431,13 @@ function getCaretPosition(txtarea)
var caretPos = new caretPosition(); var caretPos = new caretPosition();
// simple Gecko/Opera way // simple Gecko/Opera way
if(txtarea.selectionStart || txtarea.selectionStart == 0) if (!is_ie && (txtarea.selectionStart || txtarea.selectionStart == 0))
{ {
caretPos.start = txtarea.selectionStart; caretPos.start = txtarea.selectionStart;
caretPos.end = txtarea.selectionEnd; caretPos.end = txtarea.selectionEnd;
} }
// dirty and slow IE way // dirty and slow IE way
else if(document.selection) else if (document.selection)
{ {
// get current selection // get current selection
var range = document.selection.createRange(); var range = document.selection.createRange();