aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Dröscher <dhn2@users.sourceforge.net>2006-11-24 18:18:17 +0000
committerDominik Dröscher <dhn2@users.sourceforge.net>2006-11-24 18:18:17 +0000
commit2d31d53289fe4232b43e84a6d5968aa531be8a72 (patch)
treeefd1f3c4788fad5047c1d400440414365fb023be
parentd529f78adb85698c9382ad29e4583f309eaf850a (diff)
downloadforums-2d31d53289fe4232b43e84a6d5968aa531be8a72.tar
forums-2d31d53289fe4232b43e84a6d5968aa531be8a72.tar.gz
forums-2d31d53289fe4232b43e84a6d5968aa531be8a72.tar.bz2
forums-2d31d53289fe4232b43e84a6d5968aa531be8a72.tar.xz
forums-2d31d53289fe4232b43e84a6d5968aa531be8a72.zip
Editor updates with proper IE support. Needs a lot more testing, especially in non-Windows browsers
git-svn-id: file:///svn/phpbb/trunk@6651 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat
-rw-r--r--phpBB/adm/style/editor.js70
-rw-r--r--phpBB/styles/subSilver/template/editor.js70
2 files changed, 66 insertions, 74 deletions
diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js
index 5f419f18d2..50f34d37d8 100644
--- a/phpBB/adm/style/editor.js
+++ b/phpBB/adm/style/editor.js
@@ -86,6 +86,9 @@ function bbfontstyle(bbopen, bbclose)
{
theSelection = false;
document.forms[form_name].elements[text_name].focus();
+
+ var textarea = document.forms[form_name].elements[text_name];
+ var new_pos = getCaretPosition(textarea).start + bbopen.length;
if ((clientVer >= 4) && is_ie && is_win)
{
@@ -109,32 +112,19 @@ function bbfontstyle(bbopen, bbclose)
return;
}
- // Close image tag before adding
- if (imageTag)
- {
- insert_text(bbtags[15]);
-
- // Remove the close image tag from the list
- lastValue = arraypop(bbcode) - 1;
-
- // Return button back to normal state
- document.forms[form_name].addbbcode14.value = 'Img';
- imageTag = false;
- }
-
// Open tag
insert_text(bbopen + bbclose);
// Center the cursor when we don't have a selection
- var textarea = document.forms[form_name].elements[text_name];
- var new_pos = getCaretPosition(textarea).start - bbclose.length;
+
// IE & Opera
if (document.selection)
{
var range = textarea.createTextRange();
range.move("character", new_pos);
- range.select();
+ range.select();
+ storeCaret(document.forms[form_name].elements[text_name]);
}
//Gecko
else if (!isNaN(textarea.selectionStart))
@@ -144,9 +134,6 @@ function bbfontstyle(bbopen, bbclose)
}
document.forms[form_name].elements[text_name].focus();
-
- storeCaret(document.forms[form_name].elements[text_name]);
-
return;
}
@@ -172,6 +159,7 @@ function insert_text(text, spaces, popup)
{
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 if (!isNaN(textarea.selectionStart))
{
@@ -186,6 +174,7 @@ function insert_text(text, spaces, popup)
{
textarea.value = textarea.value + text;
}
+ document.forms[form_name].elements[text_name].focus();
}
/**
@@ -372,29 +361,36 @@ function getCaretPosition(txtarea)
var caretPos = new caretPosition();
// dirty IE way
- if(document.selection)
- {
- txtarea.focus();
-
- //the current selection
- var curr_sel = document.selection.createRange();
- var curr_length = curr_sel.text.length;
-
- // back to 0
- curr_sel.moveStart ('character', -txtarea.value.length);
+ // Idea by tkirby on http://www.csie.ntu.edu.tw/~b88039/html/jslib/caret.html
+ if(document.selection && is_ie)
+ {
+ //insert dummy caracter at current position
+ var dummy = "\001";
+ var sel = document.selection.createRange();
+ var dul = sel.duplicate();
+ var len = 0;
+ dul.moveToElementText(txtarea);
+ sel.text = dummy;
+
+ //find dummy chraracter again
+ len = (dul.text.indexOf(c));
+ sel.moveStart('character',-1);
+ sel.text = "";
- //start = selected text - original selection
- caretPos.start = curr_sel.text.length - curr_length;
+ if (len == -1)
+ {
+ len = 0;
+ }
- // end = selection length
- caretPos.end = curr_sel.text.length;
+ caretPos.start = len;
+ caretPos.end = len;
}
- // simple Gecko way
- else if(!isNaN(txtarea.selectionStart))
+ // simple Gecko/Opera way
+ else if(txtarea.selectionStart || txtarea.selectionStart == 0)
{
caretPos.start = txtarea.selectionStart;
caretPos.end = txtarea.selectionEnd;
}
-
- return (caretPos);
+
+ return caretPos;
} \ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/editor.js b/phpBB/styles/subSilver/template/editor.js
index 5f419f18d2..50f34d37d8 100644
--- a/phpBB/styles/subSilver/template/editor.js
+++ b/phpBB/styles/subSilver/template/editor.js
@@ -86,6 +86,9 @@ function bbfontstyle(bbopen, bbclose)
{
theSelection = false;
document.forms[form_name].elements[text_name].focus();
+
+ var textarea = document.forms[form_name].elements[text_name];
+ var new_pos = getCaretPosition(textarea).start + bbopen.length;
if ((clientVer >= 4) && is_ie && is_win)
{
@@ -109,32 +112,19 @@ function bbfontstyle(bbopen, bbclose)
return;
}
- // Close image tag before adding
- if (imageTag)
- {
- insert_text(bbtags[15]);
-
- // Remove the close image tag from the list
- lastValue = arraypop(bbcode) - 1;
-
- // Return button back to normal state
- document.forms[form_name].addbbcode14.value = 'Img';
- imageTag = false;
- }
-
// Open tag
insert_text(bbopen + bbclose);
// Center the cursor when we don't have a selection
- var textarea = document.forms[form_name].elements[text_name];
- var new_pos = getCaretPosition(textarea).start - bbclose.length;
+
// IE & Opera
if (document.selection)
{
var range = textarea.createTextRange();
range.move("character", new_pos);
- range.select();
+ range.select();
+ storeCaret(document.forms[form_name].elements[text_name]);
}
//Gecko
else if (!isNaN(textarea.selectionStart))
@@ -144,9 +134,6 @@ function bbfontstyle(bbopen, bbclose)
}
document.forms[form_name].elements[text_name].focus();
-
- storeCaret(document.forms[form_name].elements[text_name]);
-
return;
}
@@ -172,6 +159,7 @@ function insert_text(text, spaces, popup)
{
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 if (!isNaN(textarea.selectionStart))
{
@@ -186,6 +174,7 @@ function insert_text(text, spaces, popup)
{
textarea.value = textarea.value + text;
}
+ document.forms[form_name].elements[text_name].focus();
}
/**
@@ -372,29 +361,36 @@ function getCaretPosition(txtarea)
var caretPos = new caretPosition();
// dirty IE way
- if(document.selection)
- {
- txtarea.focus();
-
- //the current selection
- var curr_sel = document.selection.createRange();
- var curr_length = curr_sel.text.length;
-
- // back to 0
- curr_sel.moveStart ('character', -txtarea.value.length);
+ // Idea by tkirby on http://www.csie.ntu.edu.tw/~b88039/html/jslib/caret.html
+ if(document.selection && is_ie)
+ {
+ //insert dummy caracter at current position
+ var dummy = "\001";
+ var sel = document.selection.createRange();
+ var dul = sel.duplicate();
+ var len = 0;
+ dul.moveToElementText(txtarea);
+ sel.text = dummy;
+
+ //find dummy chraracter again
+ len = (dul.text.indexOf(c));
+ sel.moveStart('character',-1);
+ sel.text = "";
- //start = selected text - original selection
- caretPos.start = curr_sel.text.length - curr_length;
+ if (len == -1)
+ {
+ len = 0;
+ }
- // end = selection length
- caretPos.end = curr_sel.text.length;
+ caretPos.start = len;
+ caretPos.end = len;
}
- // simple Gecko way
- else if(!isNaN(txtarea.selectionStart))
+ // simple Gecko/Opera way
+ else if(txtarea.selectionStart || txtarea.selectionStart == 0)
{
caretPos.start = txtarea.selectionStart;
caretPos.end = txtarea.selectionEnd;
}
-
- return (caretPos);
+
+ return caretPos;
} \ No newline at end of file
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-11 10:33:32 +0000