Ticket #2606: ticket2606.2.patch

editor/_source/classes/fckenterkey.js

@@ -1 @@
-?/*
+/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
@@ -172 +172 @@
                 return false ;
         }
 
+        //fix for webkit-based browsers (http://dev.fckeditor.net/ticket/2606) - deletes button
+        if ( FCKBrowserInfo.IsSafari ) {
+                var prevNode = FCKDomTools.GetPreviousSourceNode( oRange.StartNode, true ) ;
+
+                if ( prevNode && this._IsButton( prevNode ) &&
+                        ( oRange.StartNode.nodeType != 3 || (  this.Window.getSelection().focusNode != oRange.StartNode || this.Window.getSelection().focusOffset == 0 ) )
+                )
+                {
+                        prevNode.parentNode.removeChild( prevNode ) ;
+                        return true ;
+                }
+        }
+
         // On IE, it is better for us handle the deletion if the caret is preceeded
         // by a <br> (#1383).
         if ( FCKBrowserInfo.IsIE )
@@ -360 +373 @@
                 return true ;
         }
 
+        //fix for webkit-based browsers (http://dev.fckeditor.net/ticket/2606) - deletes button
+        if ( FCKBrowserInfo.IsSafari ) {
+                var nextNode = FCKDomTools.GetNextSourceNode( oRange.StartNode, true ) ;
+                if ( nextNode && this._IsButton( nextNode ) && ( oRange.StartNode.nodeType != 3 ||  this.Window.getSelection().focusOffset == oRange.StartNode.length ))
+                {
+                        nextNode.parentNode.removeChild( nextNode ) ;
+                        return true ;
+                }
+        }
+
         // There is just one special case for collapsed selections at the end of a block.
         if ( oRange.CheckIsCollapsed() && oRange.CheckEndOfBlock( FCKBrowserInfo.IsGeckoLike ) )
         {
@@ -711 +734 @@
         range.Select() ;
         range.Release() ;
 }
+
+// Used by doDelete and doBackspace in webkit-based browsers to delete a button, ticket #2606
+FCKEnterKey.prototype._IsButton = function ( element )
+{
+        return ( element && element.tagName &&
+                ((element.tagName.toLowerCase() == 'input' &&
+                        (element.type.toLowerCase() == 'button' || element.type.toLowerCase() == 'submit' || element.type.toLowerCase() == 'reset')
+                ) || element.tagName.toLowerCase() == "button")
+        );
+}
+ No newline at end of file