Changeset 898

Timestamp:

10/10/07 19:20:10 (6 years ago)

Author:

ray

Message:

#1081 Control character is not being removed inside SCRIPT tags or HEAD when switching from textmode to htmlmode

Location:

trunk/modules

Files:

• Gecko/Gecko.js (modified) (1 diff)
• InternetExplorer/InternetExplorer.js (modified) (3 diffs)

trunk/modules/Gecko/Gecko.js

@@ -692 +692 @@
 Xinha.prototype.setCC = function ( target )
 {
+  var cc = this.cc;
   try
   {
     if ( target == "textarea" )
     {
-      var ta = this._textArea;
+          var ta = this._textArea;
       var index = ta.selectionStart;
       var before = ta.value.substring( 0, index )
       var after = ta.value.substring( index, ta.value.length );
 
-      if ( after.match(/^[^<]*>/) )
+      if ( after.match(/^[^<]*>/) ) // make sure cursor is in an editable area (outside tags, script blocks, and inside the body)
       {
         var tagEnd = after.indexOf(">") + 1;
-        ta.value = before + after.substring( 0, tagEnd ) + this.cc + after.substring( tagEnd, after.length );
-      }
-      else ta.value = before + this.cc + after;
+        ta.value = before + after.substring( 0, tagEnd ) + cc + after.substring( tagEnd, after.length );
+      }
+      else ta.value = before + cc + after;
+          ta.value = ta.value.replace(new RegExp ('(<script[^>]*>[^'+cc+']*?)('+cc+')([^'+cc+']*?<\/script>)'), "$1$3$2");
+          ta.value = ta.value.replace(new RegExp ('^([^'+cc+']*)('+cc+')([^'+cc+']*<body[^>]*>)(.*?)'), "$1$3$2$4");
     }
     else
     {
       var sel = this.getSelection();
-      sel.getRangeAt(0).insertNode( document.createTextNode( this.cc ) );
+      sel.getRangeAt(0).insertNode( document.createTextNode( cc ) );
     }
   } catch (e) {}

trunk/modules/InternetExplorer/InternetExplorer.js

@@ -436 +436 @@
 Xinha.prototype.setCC = function ( target )
 {
+  var cc = this.cc;
   if ( target == "textarea" )
   {
@@ -441 +442 @@
     var pos = document.selection.createRange();
     pos.collapse();
-    pos.text = this.cc;
-    var index = ta.value.indexOf( this.cc );
+    pos.text = cc;
+    var index = ta.value.indexOf( cc );
     var before = ta.value.substring( 0, index );
-    var after  = ta.value.substring( index + this.cc.length , ta.value.length );
+    var after  = ta.value.substring( index + cc.length , ta.value.length );
     
-    if ( after.match(/^[^<]*>/) )
+        if ( after.match(/^[^<]*>/) ) // make sure cursor is in an editable area (outside tags, script blocks, and inside the body)
     {
       var tagEnd = after.indexOf(">") + 1;
-      ta.value = before + after.substring( 0, tagEnd ) + this.cc + after.substring( tagEnd, after.length );
-    }
-    else ta.value = before + this.cc + after;
+      ta.value = before + after.substring( 0, tagEnd ) + cc + after.substring( tagEnd, after.length );
+    }
+    else ta.value = before + cc + after;
+    ta.value = ta.value.replace(new RegExp ('(<script[^>]*>[^'+cc+']*?)('+cc+')([^'+cc+']*?<\/script>)'), "$1$3$2");
+    ta.value = ta.value.replace(new RegExp ('^([^'+cc+']*)('+cc+')([^'+cc+']*<body[^>]*>)(.*?)'), "$1$3$2$4");
   }
   else
@@ -460 +463 @@
     {
       var control = r.item(0);
-      control.outerHTML += this.cc;
+      control.outerHTML += cc;
     }
     else
     {
       r.collapse();
-      r.text = this.cc;
+      r.text = cc;
     }
   }