Changeset 1051

Timestamp:

10/03/08 19:03:48 (5 years ago)

Author:

ray

Message:

#1224 sevenbitclean / ghost cursor error with html mode toggle

Location:

trunk

Files:

• XinhaCore.js (modified) (1 diff)
• modules/Gecko/Gecko.js (modified) (3 diffs)
• modules/InternetExplorer/InternetExplorer.js (modified) (2 diffs)
• modules/Opera/Opera.js (modified) (1 diff)
• modules/WebKit/WebKit.js (modified) (3 diffs)
• plugins/InsertSnippet2/readme.html (modified) (1 diff)

trunk/XinhaCore.js

@@ -4939 +4939 @@
   if ( this.config.sevenBitClean )
   {
-    html = html.replace(/[^ -~\r\n\t]/g, function(c) { return '&#'+c.charCodeAt(0)+';'; });
-  }
-  
+    html = html.replace(/[^ -~\r\n\t]/g, function(c) { return (c != Xinha.cc) ? '&#'+c.charCodeAt(0)+';' : c; });
+  }
+
   //prevent execution of JavaScript (Ticket #685)
   html = html.replace(/(<script[^>]*((type=[\"\']text\/)|(language=[\"\'])))(freezescript)/gi,"$1javascript");

trunk/modules/Gecko/Gecko.js

@@ -736 +736 @@
 
 //Control character for retaining edit location when switching modes
-Xinha.prototype.cc = String.fromCharCode(8286); 
+Xinha.cc = String.fromCharCode(8286); 
 
 Xinha.prototype.setCC = function ( target )
 {
-  var cc = this.cc;
+  var cc = Xinha.cc;
   try
   {
@@ -773 +773 @@
   {
   var ta = this._textArea;
-  var pos = ta.value.indexOf( this.cc );
+  var pos = ta.value.indexOf( Xinha.cc );
   if ( pos == -1 ) return;
-  var end = pos + this.cc.length;
+  var end = pos + Xinha.cc.length;
   var before =  ta.value.substring( 0, pos );
   var after = ta.value.substring( end, ta.value.length );
@@ -796 +796 @@
     {
       var doc = this._doc; 
-      doc.body.innerHTML = doc.body.innerHTML.replace(new RegExp(this.cc),'<span id="XinhaEditingPostion"></span>');
+      doc.body.innerHTML = doc.body.innerHTML.replace(new RegExp(Xinha.cc),'<span id="XinhaEditingPostion"></span>');
       var posEl = doc.getElementById('XinhaEditingPostion');
       this.selectNodeContents(posEl);

trunk/modules/InternetExplorer/InternetExplorer.js

@@ -789 +789 @@
 
 // Control character for retaining edit location when switching modes
-Xinha.prototype.cc = String.fromCharCode(0x2009);
+Xinha.cc = String.fromCharCode(0x2009);
 
 Xinha.prototype.setCC = function ( target )
 {
-  var cc = this.cc;
+  var cc = Xinha.cc;
   if ( target == "textarea" )
   {
@@ -837 +837 @@
   // in case the cursor is inside a link automatically created from a url
   // the cc also appears in the url and we have to strip it out additionally 
-  if( range.findText( escape(this.cc) ) )
+  if( range.findText( escape(Xinha.cc) ) )
   {
     range.select();
     range.text = '';
   }
-  if( range.findText( this.cc ) )
+  if( range.findText( Xinha.cc ) )
   {
     range.select();

trunk/modules/Opera/Opera.js

@@ -743 +743 @@
  *
  */ 
- 
+Xinha.cc = String.fromCharCode(8286);
 Xinha.prototype.setCC = function ( target )
 {
   // Do a two step caret insertion, first a single char, then we'll replace that with the 
   // id'd span.
-  var cc = String.fromCharCode(8286);
+  var cc = Xinha.cc;
   
   try

trunk/modules/WebKit/WebKit.js

@@ -723 +723 @@
 };
 
-Xinha.prototype.cc = String.fromCharCode(8286); 
+Xinha.cc = String.fromCharCode(8286); 
 
 Xinha.prototype.setCC = function ( target )
 {
-  var cc = this.cc;
+  var cc = Xinha.cc;
   try
   {
@@ -757 +757 @@
 Xinha.prototype.findCC = function ( target )
 {
+  var cc = Xinha.cc;
+  
   if ( target == 'textarea' )
   {
   var ta = this._textArea;
-  var pos = ta.value.indexOf( this.cc );
+  var pos = ta.value.indexOf( cc );
   if ( pos == -1 ) return;
-  var end = pos + this.cc.length;
+  var end = pos + cc.length;
   var before =  ta.value.substring( 0, pos );
   var after = ta.value.substring( end, ta.value.length );
@@ -784 +786 @@
     {
       var doc = this._doc; 
-      doc.body.innerHTML = doc.body.innerHTML.replace(new RegExp(this.cc),'<span id="XinhaEditingPostion"></span>');
+      doc.body.innerHTML = doc.body.innerHTML.replace(new RegExp(cc),'<span id="XinhaEditingPostion"></span>');
       var posEl = doc.getElementById('XinhaEditingPostion');
       this.selectNodeContents(posEl);

trunk/plugins/InsertSnippet2/readme.html

@@ -46 +46 @@
     <h3>Attributes</h3> 
     <dl><dt>&nbsp;n</dt><dd>&nbsp;The name of one snippet or category. It is obligatory for both.<br /></dd><dt>&nbsp;v</dt><dd> If this attribute is present in a snippet tag, there is a button in the UI that allows to insert this variable instead of the textual content of the snippet. <br /></dd><dt> c<br /></dt><dd>&nbsp;The category<br /></dd></dl> 
-    <p>Inside the plugin's directory, there is a sample XML file and PHP scrip that shows how to create the XML dynamically.<br /></p> 
+    <p>Inside the plugin's directory, there is a sample XML file and PHP script that shows how to create the XML dynamically.<br /></p> 
     <p style="font-size: 80%;">3 October 2008 Raimund Meyer (xinha@raimundmeyer.de)</p> 
   </body>