Changeset 674

Timestamp:

01/19/07 15:33:17 (6 years ago)

Author:

gogo

Message:

ticket:10 Further work on code separation etc.

Location:

trunk

Files:

• XinhaCore.js (modified) (32 diffs)
• functionsIE.js (modified) (4 diffs)
• functionsMozilla.js (modified) (8 diffs)

trunk/XinhaCore.js

@@ -2415 +2415 @@
   else
   {
+    // FIXME - can we do this without rewriting the entire document
+    //  does the above not work for IE?
     var reac = this.editorIsActivated();
     if ( reac )
@@ -2428 +2430 @@
     {
       this.activateEditor();
-    }
+    }        
     this.setEditorEvents();
     return true;
@@ -2462 +2464 @@
       );
 
+      // FIXME - this needs to be cleaned up and use editor.firePluginEvent
+      //  I don't like both onGenerate and onGenerateOnce, we should only
+      //  have onGenerate and it should only be called when the editor is 
+      //  generated (once and only once)
       // check if any plugins have registered refresh handlers
       for ( var i in editor.plugins )
@@ -2659 +2665 @@
   }
 };
+
+/** Call a method of all plugins which define the method using the supplied arguments.
+ *
+ *  Example: editor.firePluginEvent('onExecCommand', 'paste')
+ *  
+ *  The browser specific plugin (if any) is called last.  The result of each call is 
+ *  treated as boolean.  A true return means that the event will stop, no further plugins
+ *  will get the event, a false return means the event will continue to fire.
+ *
+ *  @param methodName
+ *  @param arguments to pass to the method, optional [2..n] 
+ */
+
+Xinha.prototype.firePluginEvent = function(methodName)
+{
+  // arguments is not a real array so we can't just .shift() it unfortunatly.
+  var argsArray = [ ];
+  for(var i = 1; i < arguments.length; i++)
+  {
+    argsArray[i-1] = arguments[i];
+  }
+  
+  for ( var i in this.plugins )
+  {
+    var plugin = this.plugins[i].instance;
+    
+    // Skip the browser specific plugin
+    if ( plugin == this._browserSpecificPlugin) continue;
+    
+    if ( plugin && typeof plugin[methodName] == "function" )
+    {
+      if ( plugin[methodName].apply(plugin, argsArray) )
+      {
+        return true;
+      }
+    }
+  }
+  
+  // Now the browser speific
+  var plugin = this._browserSpecificPlugin;
+  if ( plugin && typeof plugin[methodName] == "function" )
+  {
+    if ( plugin[methodName].apply(plugin, argsArray) )
+    {
+      return true;
+    }
+  }
+    
+  return false;
+}
 
 Xinha.loadStyle = function(style, plugin)
@@ -3349 +3405 @@
   }
 
+  // FIXME: this should be using this.firePluginEvent('onUpdateToolbar')
+  //   but we have to make sure that the plugins using that event return false
+  //   if they should let the event fire on other plugins, currently the below
+  //   code doesn't take the return value into account
+  
   // check if any plugins have registered refresh handlers
   for ( var indexPlugin in this.plugins )
@@ -3385 +3446 @@
   if ( prnt === null )
   {
+    // Hmm, I think Xinha.getParentElement() would do the job better?? - James
     try
     {
@@ -3728 +3790 @@
   this.focusEditor();
   cmdID = cmdID.toLowerCase();
-  // useCSS deprecated & replaced by styleWithCSS
-  if ( Xinha.is_gecko )
-  {
-    try
-    {
-      this._doc.execCommand('useCSS', false, true); //switch useCSS off (true=off)
-      this._doc.execCommand('styleWithCSS', false, false); //switch styleWithCSS off 
-      
-    } catch (ex) {}
-  }
+  
+  // See if any plugins want to do something special
+  if(this.firePluginEvent('onExecCommand', cmdID, UI, param))
+  {
+    this.updateToolbar();
+    return false;
+  }
+
   switch (cmdID)
   {
@@ -3788 +3848 @@
     case "copy":
     case "paste":
-    try
-    {
       this._doc.execCommand(cmdID, UI, param);
       if ( this.config.killWordOnPaste )
@@ -3795 +3853 @@
         this._wordClean();
       }
-    }
-    catch (ex)
-    {
-      if ( Xinha.is_gecko )
-      {
-        alert(Xinha._lc("The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly."));
-      }
-    }
     break;
     case "lefttoright":
@@ -3870 +3920 @@
 {
   var editor = this;
-  var keyEvent = this.isKeyEvent(ev);
 
   //call events of textarea
@@ -3878 +3927 @@
   }
   
-  if ( keyEvent )
+  if ( this.isKeyEvent(ev) )
   {
     // Run the ordinary plugins first
-    for ( var i in editor.plugins )
-    {
-      var plugin = editor.plugins[i].instance;
-      
-      if ( plugin == editor._browserSpecificPlugin) continue;
-      
-      if ( plugin && typeof plugin.onKeyPress == "function" )
-      {
-        if ( plugin.onKeyPress(ev) )
-        {
-          return false;
-        }
-      }
+    if(editor.firePluginEvent('onKeyPress', ev))
+    {
+      return false;
     }
     
-    // Now run the browser specific one
-    if(typeof editor._browserSpecificPlugin.onKeyPress == "function")
-    {
-      if(editor._browserSpecificPlugin.onKeyPress(ev)) 
-      {
-        return false;
-      }
-    }
-  }
-
-  if ( keyEvent && ev.ctrlKey && !ev.altKey )
-  {
-        this._shortCuts(ev);
+    // Handle the core shortcuts
+    if ( this.isShortCut( ev ) )
+    {
+      this._shortCuts(ev);
+    }
   }
   
@@ -3928 +3959 @@
 Xinha.prototype._shortCuts = function (ev)
 {
-  var editor = this;
-  var sel = null;
-  var range = null;
-  var key = String.fromCharCode(Xinha.is_ie ? ev.keyCode : ev.charCode).toLowerCase();
+  var key = this.getKey(ev).toLowerCase();
   var cmd = null;
   var value = null;
   switch (key)
   {
-    case 'a':
-    if ( !Xinha.is_ie )
-    {
-      // KEY select all
-      sel = this._getSelection();
-      sel.removeAllRanges();
-      range = this._createRange();
-      range.selectNodeContents(this._doc.body);
-      sel.addRange(range);
-      Xinha._stopEvent(ev);
-    }
-    break;
-
     // simple key commands follow
 
@@ -3961 +3976 @@
     case 'z': cmd = "undo"; break;
     case 'y': cmd = "redo"; break;
-    case 'v':
-    if ( Xinha.is_ie || editor.config.htmlareaPaste )
-    {
-      cmd = "paste";
-    }
-    break;
+    case 'v': cmd = "paste"; break;
     case 'n':
     cmd = "formatblock";
-    value = Xinha.is_ie ? "<p>" : "p";
+    value = "p";
     break;
 
@@ -3983 +3993 @@
     cmd = "formatblock";
     value = "h" + key;
-    if ( Xinha.is_ie )
-    {
-      value = "<" + value + ">";
-    }
     break;
   }
@@ -4228 +4234 @@
   }
   
-  if (1 || Xinha.is_gecko )
-  {
-    var top  = 0;
-    var left = 0;
-    while ( e )
-    {
-      top  += e.offsetTop;
-      left += e.offsetLeft;
-      if ( e.offsetParent && e.offsetParent.tagName.toLowerCase() != 'body' )
-      {
-        e = e.offsetParent;
-      }
-      else
-      {
-        e = null;
-      }
-    }
-    this._iframe.contentWindow.scrollTo(left, top);
-  }
+  // This was at one time limited to Gecko only, but I see no reason for it to be. - James
+  var position = Xinha.getElementTopLeft(e);  
+  this._iframe.contentWindow.scrollTo(position.left, position.top);
 };
 
@@ -4277 +4267 @@
 Xinha.prototype.outwardHtml = function(html)
 {
+  for ( var i in this.plugins )
+  {
+    var plugin = this.plugins[i].instance;    
+    if ( plugin && typeof plugin.outwardHtml == "function" )
+    {
+      html = plugin.outwardHtml(html);
+    }
+  }
+  
   html = html.replace(/<(\/?)b(\s|>|\/)/ig, "<$1strong$2");
   html = html.replace(/<(\/?)i(\s|>|\/)/ig, "<$1em$2");
@@ -4288 +4287 @@
 
   // IE puts this in can't figure out why
+  //  leaving this in the core instead of InternetExplorer 
+  //  because it might be something we are doing so could present itself
+  //  in other browsers - James 
   html = html.replace(/https?:\/\/null\//g, serverBase);
 
@@ -4303 +4305 @@
     html = html.replace(/[^ -~\r\n\t]/g, function(c) { return '&#'+c.charCodeAt(0)+';'; });
   }
-
-  // ticket:56, the "greesemonkey" plugin for Firefox adds this junk,
-  // so we strip it out.  Original submitter gave a plugin, but that's
-  // a bit much just for this IMHO - james
-  if ( Xinha.is_gecko )
-  {
-    html = html.replace(/<script[\s]*src[\s]*=[\s]*['"]chrome:\/\/.*?["']>[\s]*<\/script>/ig, '');
-  }
+  
   //prevent execution of JavaScript (Ticket #685)
   html = html.replace(/(<script[^>]*)(freezescript)/gi,"$1javascript");
@@ -4319 +4314 @@
     html = Xinha.stripCoreCSS(html);
   }
-  
-  
+    
   return html;
 };
 
 Xinha.prototype.inwardHtml = function(html)
-{
-  // Midas uses b and i instead of strong and em, um, hello,
-  // mozilla, this is the 21st century calling!
-  if ( Xinha.is_gecko )
-  {
-    html = html.replace(/<(\/?)strong(\s|>|\/)/ig, "<$1b$2");
-    html = html.replace(/<(\/?)em(\s|>|\/)/ig, "<$1i$2");    
-  }
-  
+{  
+  for ( var i in this.plugins )
+  {
+    var plugin = this.plugins[i].instance;    
+    if ( plugin && typeof plugin.inwardHtml == "function" )
+    {
+      html = plugin.inwardHtml(html);
+    }    
+  }
+    
   // Both IE and Gecko use strike instead of del (#523)
   html = html.replace(/<(\/?)del(\s|>|\/)/ig, "<$1strike$2");
@@ -4444 +4439 @@
     html = html.replace(baseRe, '$1');
   }
-
-//  if ( Xinha.is_ie )
-//  {
-    // This is now done in inward & outward
-    // Don't know why but IE is doing this (putting http://null/ on links?!
-    // alert(html);
-    // var nullRE = new RegExp('https?:\/\/null\/', 'g');
-    // html = html.replace(nullRE, location.href.replace(/(https?:\/\/[^\/]*\/).*/, '$1'));
-    // alert(html);
-//  }
 
   return html;
@@ -5062 +5047 @@
   {
    if ( !this.borders )
-   {
-    name = "bordered";
+   {    
     this.borders = true;
    }
    else
    {
-     name = "";
      this.borders = false;
    }
@@ -5076 +5059 @@
      if ( this.borders )
      {
-        // flashing the display forces moz to listen (JB:18-04-2005) - #102
-        if ( Xinha.is_gecko )
-        {
-          tables[i].style.display="none";
-          tables[i].style.display="table";
-        }
         Xinha._addClass(tables[i], 'htmtableborders');
      }
@@ -5182 +5159 @@
 {
   var req = null;
-  if ( Xinha.is_ie )
-  {
-   req = new ActiveXObject("Microsoft.XMLHTTP");
-  }
-  else
-  {
-   req = new XMLHttpRequest();
-  }
+  req = Xinha.getXMLHTTPRequestObject();
 
   var content = '';
@@ -5233 +5203 @@
 {
   var req = null;
-  if ( Xinha.is_ie )
-  {
-   req = new ActiveXObject("Microsoft.XMLHTTP");
-  }
-  else
-  {
-   req = new XMLHttpRequest();
-  }
+  req = Xinha.getXMLHTTPRequestObject();
 
   function callBack()
@@ -5265 +5228 @@
 {
   var req = null;
-  if ( Xinha.is_ie )
-  {
-   req = new ActiveXObject("Microsoft.XMLHTTP");
-  }
-  else
-  {
-   req = new XMLHttpRequest();
-  }
+  req = Xinha.getXMLHTTPRequestObject();
 
   // Synchronous!
@@ -5520 +5476 @@
 /**
  * Load a javascript file by inserting it in the HEAD tag and eventually call a function when loaded
+ *
+ * Note that this method cannot be abstracted into browser specific files
+ *  because this method LOADS the browser specific files.  Hopefully it should work for most
+ *  browsers as it is.
+ *
  * @param {string} U (Url)      Source url of the file to load
  * @param {object} C {Callback} Callback function to launch once ready (optional)
@@ -5525 +5486 @@
  * @param {object} B (Bonus}    Arbitrary object send as a param to the callback function (optional)
  * @public
+ * 
  */
-Xinha._loadback = function(U, C, O, B)
-{
-  var T = Xinha.is_ie ? "onreadystatechange" : "onload";
+ 
+Xinha._loadback = function(Url, Callback, Scope, Bonus)
+{  
+  var T = !Xinha.is_ie ? "onload" : 'onreadystatechange';
   var S = document.createElement("script");
   S.type = "text/javascript";
-  S.src = U;
-  if ( C )
+  S.src = Url;
+  if ( Callback )
   {
     S[T] = function()
-    {
-      if ( Xinha.is_ie && ! ( /loaded|complete/.test(window.event.srcElement.readyState) ) )
+    {      
+      if ( Xinha.is_ie && ( ! ( /loaded|complete/.test(window.event.srcElement.readyState) ) ) )
       {
         return;
       }
-      C.call(O ? O : this, B);
+      
+      Callback.call(Scope ? Scope : this, Bonus);
       S[T] = null;
     };
@@ -5738 +5702 @@
 };
 
+/** 
+ *  Calculate the top and left pixel position of an element in the DOM.
+ *
+ *  @param   element HTML Element DOM Node
+ *  @returns Object with integer properties top and left
+ */
+ 
+Xinha.getElementTopLeft = function(element)
+{
+  var position = { top:0, left:0 };
+  while ( element )
+  {
+    position.top  += element.offsetTop;
+    position.left += element.offsetLeft;
+    if ( element.offsetParent && element.offsetParent.tagName.toLowerCase() != 'body' )
+    {
+      element = element.offsetParent;
+    }
+    else
+    {
+      element = null;
+    }
+  }
+  
+  return position;
+}
+
 // find X position of an element
 Xinha.findPosX = function(obj)
@@ -5744 +5735 @@
   if ( obj.offsetParent )
   {
-    while ( obj.offsetParent )
-    {
-      curleft += obj.offsetLeft;
-      obj = obj.offsetParent;
-    }
+    return Xinha.getElementTopLeft(obj).left;    
   }
   else if ( obj.x )
@@ -5763 +5750 @@
   if ( obj.offsetParent )
   {
-    while ( obj.offsetParent )
-    {
-      curtop += obj.offsetTop;
-      obj = obj.offsetParent;
-    }
+    return Xinha.getElementTopLeft(obj).top;    
   }
   else if ( obj.y )
@@ -5918 +5901 @@
 Xinha.prototype.isKeyEvent            = function(event) { Xinha.notImplemented("isKeyEvent"); }
 
+/** Determines if the given key event object represents a combination of CTRL-<key>,
+ *  which for Xinha is a shortcut.  Note that CTRL-ALT-<key> is not a shortcut.
+ *
+ *  @param    keyEvent
+ *  @returns  true|false
+ */
+ 
+Xinha.prototype.isShortCut = function(keyEvent)
+{
+  if(keyEvent.ctrlKey && !keyEvent.altKey)
+  {
+    return true;
+  }
+  
+  return false;
+}
+
+/** Return the character (as a string) of a keyEvent  - ie, press the 'a' key and
+ *  this method will return 'a', press SHIFT-a and it will return 'A'.
+ * 
+ *  @param   keyEvent
+ *  @returns string
+ */
+                                   
+Xinha.prototype.getKey = function(keyEvent) { Xinha.notImplemented("getKey"); }
+
 /** Return the HTML string of the given Element, including the Element.
  * 
@@ -5926 +5935 @@
 Xinha.getOuterHTML = function(element) { Xinha.notImplemented("getOuterHTML"); }
 
-
-
+/** Get a new XMLHTTPRequest Object ready to be used. 
+ *
+ * @returns object XMLHTTPRequest 
+ */
+
+Xinha.getXMLHTTPRequestObject = function() 
+{       
+  try
+  {    
+    return new XMLHttpRequest();
+  }
+  catch(e)
+  {
+    Xinha.notImplemented('getXMLHTTPRequestObject');
+  }
+}
+ 
 // Compatability - all these names are deprecated and will be removed in a future version
 Xinha.prototype._activeElement  = function(sel) { return this.activeElement(sel); }

trunk/functionsIE.js

@@ -51 +51 @@
 InternetExplorer.prototype.onKeyPress = function(ev)
 {
+  // Shortcuts
+  if(this.editor.isShortCut(ev))
+  {
+    switch(this.editor.getKey(ev).toLowerCase())
+    {
+      case 'n':
+      {
+        this.editor.execCommand('formatblock', false, '<p>');        
+        Xinha._stopEvent(ev);
+        return true;
+      }
+      break;
+      
+      case '1':
+      case '2':
+      case '3':
+      case '4':
+      case '5':
+      case '6':
+      {
+        this.editor.execCommand('formatblock', false, '<h'+this.editor.getKey(ev).toLowerCase()+'>');
+        Xinha._stopEvent(ev);
+        return true;
+      }
+      break;
+    }
+  }
+  
   switch(ev.keyCode) 
   {
@@ -107 +135 @@
   }
 };
+
+InternetExplorer.prototype.inwardHtml = function(html)
+{
+   // Both IE and Gecko use strike internally instead of del (#523)
+   // Xinha will present del externally (see Xinha.prototype.outwardHtml
+   html = html.replace(/<(\/?)del(\s|>|\/)/ig, "<$1strike$2");
+   
+   return html;
+}
 
 /*--------------------------------------------------------------------------*/
@@ -338 +375 @@
 }
 
+/** Return the character (as a string) of a keyEvent  - ie, press the 'a' key and
+ *  this method will return 'a', press SHIFT-a and it will return 'A'.
+ * 
+ *  @param   keyEvent
+ *  @returns string
+ */
+                                   
+Xinha.prototype.getKey = function(keyEvent)
+{
+  return String.fromCharCode(keyEvent.keyCode);
+}
+
+
 /** Return the HTML string of the given Element, including the Element.
  * 
@@ -349 +399 @@
 };
   
+/** Get a new XMLHTTPRequest Object ready to be used. 
+ *
+ * @returns object XMLHTTPRequest 
+ */
+
+Xinha.getXMLHTTPRequestObject = function () { return new ActiveXObject("Microsoft.XMLHTTP"); }

trunk/functionsMozilla.js

@@ -52 +52 @@
 {
   var editor = this.editor;
-  
-  if ( ev.ctrlKey &&  editor._unLink && editor._unlinkOnUndo )
-  {
-    if ( String.fromCharCode(ev.charCode).toLowerCase() == 'z' )
-    {
-      Xinha._stopEvent(ev);
-      editor._unLink();
-      editor.updateToolbar();
-      return true; // Stop further
-    }
-  }
-  
   var s = editor._getSelection();
-  var autoWrap = function (textNode, tag)
-  {
-    var rightText = textNode.nextSibling;
-    if ( typeof tag == 'string')
-    {
-      tag = editor._doc.createElement(tag);
-    }
-    var a = textNode.parentNode.insertBefore(tag, rightText);
-    Xinha.removeFromParent(textNode);
-    a.appendChild(textNode);
-    rightText.data = ' ' + rightText.data;
-
-    s.collapse(rightText, 1);
-    // Xinha._stopEvent(ev);
-
-    editor._unLink = function()
-    {
-      var t = a.firstChild;
-      a.removeChild(t);
-      a.parentNode.insertBefore(t, a);
-      Xinha.removeFromParent(a);
-      editor._unLink = null;
-      editor._unlinkOnUndo = false;
-    };
-    editor._unlinkOnUndo = true;
-
-    return a;
-  };
-
-  switch ( ev.which )
+  
+  // Handle shortcuts
+  if(editor.isShortCut(ev))
+  {
+    switch(editor.getKey(ev).toLowerCase())
+    {
+      case 'z':
+      {
+        if(editor._unLink && editor._unlinkOnUndo)
+        {
+          Xinha._stopEvent(ev);
+          editor._unLink();
+          editor.updateToolbar();
+          return true;
+        }
+      }
+      break;
+      
+      case 'a':
+      {
+        // KEY select all
+        sel = this._getSelection();
+        sel.removeAllRanges();
+        range = this._createRange();
+        range.selectNodeContents(this._doc.body);
+        sel.addRange(range);
+        Xinha._stopEvent(ev);
+        return true;
+      }
+      break;
+      
+      case 'v':
+      {
+        // If we are not using htmlareaPaste, don't let Xinha try and be fancy but let the 
+        // event be handled normally by the browser (don't stopEvent it)
+        if(!editor.config.htmlareaPaste)
+        {          
+          return true;
+        }
+      }
+      break;
+    }
+  }
+  
+  // Handle normal characters
+  switch(editor.getKey(ev))
   {
     // Space, see if the text just typed looks like a URL, or email address
     // and link it appropriatly
-    case 32:
+    case ' ':
+    {      
+      var autoWrap = function (textNode, tag)
+      {
+        var rightText = textNode.nextSibling;
+        if ( typeof tag == 'string')
+        {
+          tag = editor._doc.createElement(tag);
+        }
+        var a = textNode.parentNode.insertBefore(tag, rightText);
+        Xinha.removeFromParent(textNode);
+        a.appendChild(textNode);
+        rightText.data = ' ' + rightText.data;
+    
+        s.collapse(rightText, 1);
+    
+        editor._unLink = function()
+        {
+          var t = a.firstChild;
+          a.removeChild(t);
+          a.parentNode.insertBefore(t, a);
+          Xinha.removeFromParent(a);
+          editor._unLink = null;
+          editor._unlinkOnUndo = false;
+        };
+        editor._unlinkOnUndo = true;
+    
+        return a;
+      };
+  
       if ( editor.config.convertUrlsToLinks && s && s.isCollapsed && s.anchorNode.nodeType == 3 && s.anchorNode.data.length > 3 && s.anchorNode.data.indexOf('.') >= 0 )
       {
@@ -144 +177 @@
         }
       }
+    }
+    break;    
+  }
+  
+  // Handle special keys
+  switch ( ev.keyCode )
+  {    
+    case 13: // ENTER
+      if( !ev.shiftKey && editor.config.mozParaHandler == 'dirty' )
+      {
+        editor.dom_checkInsertP();
+        Xinha._stopEvent(ev);
+      }
     break;
 
+    case 27: // ESCAPE
+    {
+      if ( editor._unLink )
+      {
+        editor._unLink();
+        Xinha._stopEvent(ev);
+      }
+      break;
+    }
+    break;
+    
+    case 8: // KEY backspace
+    case 46: // KEY delete
+    {
+      // We handle the mozilla backspace directly??
+      if ( !ev.shiftKey && this.handleBackspace() )
+      {
+        Xinha._stopEvent(ev);
+      }
+    }
+    
     default:
-      if ( ev.keyCode == 27 || ( editor._unlinkOnUndo && ev.ctrlKey && ev.which == 122 ) )
-      {
-        if ( editor._unLink )
-        {
-          editor._unLink();
-          Xinha._stopEvent(ev);
-        }
-        break;
-      }
-      else if ( ev.which || ev.keyCode == 8 || ev.keyCode == 46 )
-      {
+    {
         editor._unlinkOnUndo = false;
 
+        // Handle the "auto-linking", specifically this bit of code sets up a handler on
+        // an self-titled anchor (eg <a href="http://www.gogo.co.nz/">www.gogo.co.nz</a>)
+        // when the text content is edited, such that it will update the href on the anchor
+        
         if ( s.anchorNode && s.anchorNode.nodeType == 3 )
         {
@@ -169 +230 @@
             break; // not an anchor
           } 
+          
           if ( !a._updateAnchTimeout )
           {
@@ -180 +242 @@
                 //         This lead to never ending timer if we dont remove this line
                 //         But when removed, the email is not correctly updated
+                //
+                // - to fix this we should make fnAnchor check to see if textNode.data has
+                //   stopped changing for say 5 seconds and if so we do not make this setTimeout 
                 a._updateAnchTimeout = setTimeout(fnAnchor, 250);
               };
@@ -192 +257 @@
               var fnUrl = function()
               {
-                // @fixme: Alert, sometimes m is undefined becase the url is not an url anymore (was www.url.com and become for example www.url)
+                // Sometimes m is undefined becase the url is not an url anymore (was www.url.com and become for example www.url)
                 m = txtNode.data.match(Xinha.RE_url);
-                a.href = (m[1] ? m[1] : 'http://') + m[2];
+                if(m)
+                {
+                  a.href = (m[1] ? m[1] : 'http://') + m[2];
+                }
+                
                 // @fixme: why the hell do another timeout is started ?
                 //         This lead to never ending timer if we dont remove this line
                 //         But when removed, the url is not correctly updated
+                //
+                // - to fix this we should make fnUrl check to see if textNode.data has
+                //   stopped changing for say 5 seconds and if so we do not make this setTimeout
                 a._updateAnchTimeout = setTimeout(fnUrl, 250);
               };
               a._updateAnchTimeout = setTimeout(fnUrl, 1000);
             }
-          }
-        }
-      }
+          }        
+        }                
+    }
     break;
   }
 
-  // other keys here
-  switch (ev.keyCode)
-  {
-    case 13: // KEY enter
-      if( !ev.shiftKey && editor.config.mozParaHandler == 'dirty' )
-      {
-        editor.dom_checkInsertP();
-        Xinha._stopEvent(ev);
-      }
-    break;
-    case 8: // KEY backspace
-    case 46: // KEY delete
-      if ( !ev.shiftKey && this.handleBackspace() )
-      {
-        Xinha._stopEvent(ev);
-      }
-    break;
-  }
-  
   return false; // Let other plugins etc continue from here.
 }
@@ -270 +323 @@
     10);
 };
+
+Gecko.prototype.inwardHtml = function(html)
+{
+   // Midas uses b and i internally instead of strong and em
+   // Xinha will use strong and em externally (see Xinha.prototype.outwardHtml)   
+   html = html.replace(/<(\/?)strong(\s|>|\/)/ig, "<$1b$2");
+   html = html.replace(/<(\/?)em(\s|>|\/)/ig, "<$1i$2");    
+   
+   // Both IE and Gecko use strike internally instead of del (#523)
+   // Xinha will present del externally (see Xinha.prototype.outwardHtml
+   html = html.replace(/<(\/?)del(\s|>|\/)/ig, "<$1strike$2");
+   
+   return html;
+}
+
+Gecko.prototype.outwardHtml = function(html)
+{
+  // ticket:56, the "greesemonkey" plugin for Firefox adds this junk,
+  // so we strip it out.  Original submitter gave a plugin, but that's
+  // a bit much just for this IMHO - james
+  html = html.replace(/<script[\s]*src[\s]*=[\s]*['"]chrome:\/\/.*?["']>[\s]*<\/script>/ig, '');
+
+  return html;
+}
+
+Gecko.prototype.onExecCommand = function(cmdID, UI, param)
+{   
+  try
+  {
+    // useCSS deprecated & replaced by styleWithCSS
+    this.editor._doc.execCommand('useCSS', false, true); //switch useCSS off (true=off)
+    this.editor._doc.execCommand('styleWithCSS', false, false); //switch styleWithCSS off     
+  } catch (ex) {}
+    
+  switch(cmdID)
+  {
+    case 'paste':
+    {
+      alert(Xinha._lc("The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly."));
+      return true; // Indicate paste is done, stop command being issued to browser by Xinha.prototype.execCommand
+    }
+  }
+  
+  return false;
+}
+
 
 /*--------------------------------------------------------------------------*/
@@ -530 +629 @@
 }
 
+/** Return the character (as a string) of a keyEvent  - ie, press the 'a' key and
+ *  this method will return 'a', press SHIFT-a and it will return 'A'.
+ * 
+ *  @param   keyEvent
+ *  @returns string
+ */
+                                   
+Xinha.prototype.getKey = function(keyEvent)
+{
+  return String.fromCharCode(keyEvent.charCode);
+}
+
 /** Return the HTML string of the given Element, including the Element.
  * 
@@ -540 +651 @@
   return (new XMLSerializer()).serializeToString(element);
 };
+
+/*--------------------------------------------------------------------------*/
+/*------------ EXTEND SOME STANDARD "Xinha.prototype" METHODS --------------*/
+/*--------------------------------------------------------------------------*/
+
+Xinha.prototype._standardToggleBorders = Xinha.prototype._toggleBorders;
+Xinha.prototype._toggleBorders = function()
+{
+  var result = Xinha.prototype._standardToggleBorders();
+  
+  // flashing the display forces moz to listen (JB:18-04-2005) - #102
+  var tables = this._doc.getElementByTagName('TABLE');
+  for(var i = 0; i < tables.length; i++)
+  {
+    tables[i].style.display="none";
+    tables[i].style.display="table";
+  }
+  
+  return result;
+}