aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/subsilver2
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-11-19 21:15:25 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2011-11-19 21:15:25 -0500
commitd03366fba2e03964cc7e62b23956641916baf74f (patch)
tree1c5938d60983652f9bf967d4016d6a35f57d6179 /phpBB/styles/subsilver2
parent4be9c70827c5d87bd654bae22095b8165a689ffa (diff)
parenteb1f15bc8b7b7a284b25b2c9b9942714b6848ebc (diff)
downloadforums-d03366fba2e03964cc7e62b23956641916baf74f.tar
forums-d03366fba2e03964cc7e62b23956641916baf74f.tar.gz
forums-d03366fba2e03964cc7e62b23956641916baf74f.tar.bz2
forums-d03366fba2e03964cc7e62b23956641916baf74f.tar.xz
forums-d03366fba2e03964cc7e62b23956641916baf74f.zip
Merge remote-tracking branch 'nickvergessen/ticket/8996' into develop-olympus
* nickvergessen/ticket/8996: [ticket/8996] Also fix the BBCode bug in subsilver2 and acp [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
Diffstat (limited to 'phpBB/styles/subsilver2')
-rw-r--r--phpBB/styles/subsilver2/template/editor.js96
1 files changed, 49 insertions, 47 deletions
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js
index 7cc5de9034..5aa486d320 100644
--- a/phpBB/styles/subsilver2/template/editor.js
+++ b/phpBB/styles/subsilver2/template/editor.js
@@ -6,8 +6,8 @@
// Startup variables
var imageTag = false;
var theSelection = false;
-var bbcodeEnabled = true;
+var bbcodeEnabled = true;
// Check for Browser & Platform for PC & IE specific bits
// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
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_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));
-
var baseHeight;
/**
@@ -29,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;
@@ -38,14 +37,15 @@ function initInsertions()
{
doc = document;
}
- else
+ else
{
doc = opener.document;
}
var textarea = doc.forms[form_name].elements[text_name];
+
if (is_ie && typeof(baseHeight) != 'number')
- {
+ {
textarea.focus();
baseHeight = doc.selection.createRange().duplicate().boundingHeight;
@@ -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();
@@ -78,7 +78,7 @@ function bbstyle(bbnumber)
function bbfontstyle(bbopen, bbclose)
{
theSelection = false;
-
+
var textarea = document.forms[form_name].elements[text_name];
textarea.focus();
@@ -86,14 +86,10 @@ function bbfontstyle(bbopen, bbclose)
if ((clientVer >= 4) && is_ie && is_win)
{
// Get text selection
- theSelection = document.selection.createRange().text;
-
- if (theSelection)
+ if (textarea.createTextRange && textarea.caretPos)
{
- // Add tags around selection
- document.selection.createRange().text = bbopen + theSelection + bbclose;
- document.forms[form_name].elements[text_name].focus();
- theSelection = '';
+ textarea.caretPos.text = bbopen + textarea.caretPos.text + bbclose;
+ textarea.focus();
return;
}
}
@@ -104,7 +100,7 @@ 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;
@@ -118,12 +114,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);
}
@@ -138,16 +134,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 + ' ';
}
@@ -162,28 +158,26 @@ function insert_text(text, spaces, popup)
mozWrap(textarea, text, '');
textarea.selectionStart = sel_start + text.length;
textarea.selectionEnd = sel_end + text.length;
- }
-
+ }
else if (textarea.createTextRange && textarea.caretPos)
{
- if (baseHeight != textarea.caretPos.boundingHeight)
+ if (baseHeight != textarea.caretPos.boundingHeight)
{
textarea.focus();
storeCaret(textarea);
- }
+ }
+
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;
-
}
else
{
textarea.value = textarea.value + text;
}
- if (!popup)
+ if (!popup)
{
textarea.focus();
- }
-
+ }
}
/**
@@ -279,7 +273,6 @@ function addquote(post_id, username, l_wrote)
return;
}
-
function split_lines(text)
{
var lines = text.split('\n');
@@ -298,7 +291,7 @@ function split_lines(text)
do
{
var splitAt = line.indexOf(' ', 80);
-
+
if (splitAt == -1)
{
splitLines[j] = line;
@@ -316,7 +309,6 @@ function split_lines(text)
}
return splitLines;
}
-
/**
* From http://www.massless.org/mozedit/
*/
@@ -327,7 +319,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;
}
@@ -351,7 +343,17 @@ function mozWrap(txtarea, open, close)
*/
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();
}
@@ -387,7 +389,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]);
@@ -427,15 +429,15 @@ function caretPosition()
function getCaretPosition(txtarea)
{
var caretPos = new caretPosition();
-
+
// simple Gecko/Opera way
- if(txtarea.selectionStart || txtarea.selectionStart == 0)
+ if (!is_ie && (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();
@@ -443,16 +445,16 @@ function getCaretPosition(txtarea)
// 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;
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-01 23:11:08 +0000