Update of /cvsroot/php-blog/serendipity/deployment
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31055/deployment
Modified Files:
serendipity_editor.js
Log Message:
fixed internet explorer bugs with restored multiple categories and link
insertion
Index: serendipity_editor.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/deployment/serendipity_editor.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_editor.js 12 May 2004 14:35:29 -0000 1.5
+++ serendipity_editor.js 14 Jul 2004 10:21:05 -0000 1.6
@@ -17,16 +17,22 @@
var selLength = txtarea.textLength;
var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd;
+
if (selEnd==1 || selEnd==2) {
selEnd=selLength;
}
return (txtarea.value).substring(selStart, selEnd);
}
+function getIESelection(txtarea) {
+ return document.selection.createRange().text;
+}
+
function mozWrap(txtarea, lft, rgt) {
var selLength = txtarea.textLength;
var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd;
+
if (selEnd==1 || selEnd==2) selEnd=selLength;
var s1 = (txtarea.value).substring(0,selStart);
var s2 = (txtarea.value).substring(selStart, selEnd)
@@ -34,16 +40,18 @@
txtarea.value = s1 + lft + s2 + rgt + s3;
}
-function IEWrap(lft, rgt) {
+function IEWrap(txtarea, lft, rgt) {
strSelection = document.selection.createRange().text;
if (strSelection != "") {
document.selection.createRange().text = lft + strSelection + rgt;
+ } else {
+ txtarea.value = txtarea.value + lft + rgt;
}
}
function wrapSelection(txtarea, lft, rgt) {
if (document.all) {
- IEWrap(lft, rgt);
+ IEWrap(txtarea, lft, rgt);
} else if (document.getElementById) {
mozWrap(txtarea, lft, rgt);
}
@@ -52,14 +60,15 @@
function wrapSelectionWithLink(txtarea) {
var my_link = prompt("Enter URL:","http://");
- if (getMozSelection(txtarea) == "") {
- var my_desc = prompt("Enter Description");
+ if (document.all && getIESelection(txtarea) == "" ||
+ document.getElementById && getMozSelection(txtarea) == "") {
+ var my_desc = prompt("Enter Description", '');
}
if (my_link != null) {
lft = "<a href=\"" + my_link + "\">";
if (my_desc != null && my_desc != "") {
- rgt = my_desc +"</a>";
+ rgt = my_desc + "</a>";
} else {
rgt = "</a>";
}
@@ -110,7 +119,7 @@
}
function serendipity_insLink (area) {
- var loc = prompt('Enter Location: ');
+ var loc = prompt('Enter URL Location: ');
var text = prompt('Enter Description: ');
if (!loc) {
|