Changeset 998

Timestamp:

05/01/08 12:33:36 (5 years ago)

Author:

ray

Message:

• #1201 Add inwardHtml/outwardHtml functions to Config object
  
• Improved method for finding editing position in Gecko/Webkit
  

Location:

trunk

Files:

• XinhaCore.js (modified) (4 diffs)
• modules/Gecko/Gecko.js (modified) (1 diff)
• modules/WebKit/WebKit.js (modified) (1 diff)

trunk/XinhaCore.js

@@ -698 +698 @@
 
 
-  /** Sometimes we want to be able to replace some string in the html comng in and going out
+  /** Sometimes we want to be able to replace some string in the html coming in and going out
    *  so that in the editor we use the "internal" string, and outside and in the source view
    *  we use the "external" string  this is useful for say making special codes for
@@ -708 +708 @@
    */
   this.specialReplacements = {}; //{ 'html_string' : 'wysiwyg_string' }
+  
+  /** A filter function for the HTML used inside the editor<br />
+   * Default: function (html) { return html }
+   * 
+   * @param {String} html The whole document's HTML content
+   * @return {String} The processed HTML 
+   */
+  this.inwardHtml = function (html) { return html }
+  
+  /** A filter function for the generated HTML<br />
+   * Default: function (html) { return html }
+   * 
+   * @param {String} html The whole document's HTML content
+   * @return {String} The processed HTML 
+   */
+  this.outwardHtml = function (html) { return html }
 
  /** Set to true if you want Word code to be cleaned upon Paste. This only works if 
@@ -4880 +4896 @@
     html = Xinha.stripCoreCSS(html);
   }
-    
+
+  if (typeof this.config.outwardHtml == 'function' )
+  {
+    html = this.config.outwardHtml(html);
+  }
+
   return html;
 };
@@ -4926 +4947 @@
     html = Xinha.addCoreCSS(html);
   }
-  
+
+  if (typeof this.config.inwardHtml == 'function' )
+  {
+    html = this.config.inwardHtml(html);
+  }
+
   return html;
 };

trunk/modules/Gecko/Gecko.js

@@ -782 +782 @@
     try
     {
-      this._iframe.contentWindow.find( this.cc );
-      var sel = this.getSelection();
-      sel.getRangeAt(0).deleteContents();
-      this.scrollToElement();
+      var doc = this._doc; 
+      doc.body.innerHTML = doc.body.innerHTML.replace(new RegExp(this.cc),'<span id="XinhaEditingPostion"></span>');
+      var posEl = doc.getElementById('XinhaEditingPostion');
+      this.selectNodeContents(posEl);
+      posEl.scrollIntoView(true);
+      posEl.parentNode.removeChild(posEl);
+
       this._iframe.contentWindow.focus();
     } catch (e) {}

trunk/modules/WebKit/WebKit.js

@@ -772 +772 @@
   {
     var self = this;
-    window.setTimeout(function  () // something's not working? try a timeout ;)
-    { 
-      try 
-      {
-        if( self._iframe.contentWindow.find( self.cc ) )
-        {
-            var sel = self.getSelection();
-            sel.getRangeAt(0).deleteContents();
-                        sel.collapseToStart();
-            self._iframe.contentWindow.focus();
-         }
-      } catch (e) {alert(e)}
-    }
-    ,200);
+    try
+    {
+      var doc = this._doc; 
+      doc.body.innerHTML = doc.body.innerHTML.replace(new RegExp(this.cc),'<span id="XinhaEditingPostion"></span>');
+      var posEl = doc.getElementById('XinhaEditingPostion');
+      this.selectNodeContents(posEl);
+      this.scrollToElement(posEl);
+      posEl.parentNode.removeChild(posEl);
+
+      this._iframe.contentWindow.focus();
+    } catch (e) {}
   }
 };