Ticket #1384: fckdomrange.patch

fckdomrange.js

@@ -160 +160 @@
                         this._Range.insertNode( node ) ;
         },
 
-        CheckIsEmpty : function()
+        // Checks if the range is empty
+        // @bCheckEmptyInline Return true on empty inline tags such as: <u></u>
+        // @iTrimType 0 = full trim, 1 = left trim, 2 = right trim, 3 = no trim
+        CheckIsEmpty : function( bCheckEmptyInline, iTrimType )
         {
                 if ( this.CheckIsCollapsed() )
                         return true ;
@@ -169 +172 @@
                 var eToolDiv = this.Window.document.createElement( 'div' ) ;
                 this._Range.cloneContents().AppendTo( eToolDiv ) ;
 
-                FCKDomTools.TrimNode( eToolDiv ) ;
+                if( iTrimType == 1 )
+                {
+                        FCKDomTools.LTrimNode( eToolDiv ) ;
+                }
+                else if( iTrimType == 2 )
+                {
+                        FCKDomTools.RTrimNode( eToolDiv ) ;
+                }
+                else if( iTrimType != 3 )
+                {
+                        FCKDomTools.TrimNode( eToolDiv ) ;
+                }
 
+                if( bCheckEmptyInline )
+                {
+                        // Recursive function to determine if all children of a node are inline
+                        AreAllChildrenInline = function( pElement )
+                        {
+                                for( var i = 0; i < pElement.childNodes.length; i++ )
+                                {
+                                        var pChild = pElement.childNodes[i] ;
+
+                                        if( !pChild.nodeName )
+                                        {
+                                                return false ;
+                                        }
+                                        
+                                        if( FCKListsLib.InlineChildReqElements[pChild.nodeName.toLowerCase() ] == null )
+                                        {
+                                                return false ;
+                                        }
+                                        
+                                        if( !AreAllChildrenInline( pChild ) )
+                                        {
+                                                return false ;
+                                        }
+                                }
+                                
+                                return true ;
+                        };
+                        
+                        return AreAllChildrenInline( eToolDiv ) ;
+                }
+
                 return ( eToolDiv.innerHTML.length == 0 ) ;
         },
 
-        CheckStartOfBlock : function()
+        CheckStartOfBlock : function( refreshSelection )
         {
                 var bIsStartOfBlock = this._Cache.IsStartOfBlock ;
 
@@ -190 +235 @@
                 // Move the start boundary to the start of the block.
                 oTestRange.SetStart( oTestRange.StartBlock || oTestRange.StartBlockLimit, 1 ) ;
 
-                if ( oTestRange.CheckIsCollapsed() )
-                        bIsStartOfBlock = true ;
-                else
+                bIsStartOfBlock = oTestRange.CheckIsCollapsed() ;
+
+                if ( !bIsStartOfBlock )
                 {
-                        // Inserts the contents of the range in a div tag.
-                        var eToolDiv = oTestRange.Window.document.createElement( 'div' ) ;
-                        oTestRange._Range.cloneContents().AppendTo( eToolDiv ) ;
-
-                        // This line is why we don't use CheckIsEmpty() here...
-                        // Because using RTrimNode() or TrimNode() would be incorrect - 
                         // TrimNode() and RTrimNode() would delete <br> nodes at the end of the div node,
                         // but for checking start of block they are actually meaningful. (Bug #1350)
-                        FCKDomTools.LTrimNode( eToolDiv ) ;
-
-                        bIsStartOfBlock = ( eToolDiv.innerHTML.length == 0 ) ;
+                        // The second parameter to CheckIsEmpty forces just an LTrimNode()
+                        bIsStartOfBlock = oTestRange.CheckIsEmpty( true, 2 );
                 }
 
                 oTestRange.Release() ;
+                
+                if ( refreshSelection )
+                        this.Select() ;
 
                 return ( this._Cache.IsStartOfBlock = bIsStartOfBlock ) ;
         },
@@ -232 +273 @@
 
                 if ( !bIsEndOfBlock )
                 {
-                        // Inserts the contents of the range in a div tag.
-                        var eToolDiv = this.Window.document.createElement( 'div' ) ;
-                        oTestRange._Range.cloneContents().AppendTo( eToolDiv ) ;
-                        FCKDomTools.TrimNode( eToolDiv ) ;
-
-                        // Find out if we are in an empty tree of inline elements, like <b><i><span></span></i></b>
-                        bIsEndOfBlock = true ;
-                        var eLastChild = eToolDiv ;
-                        while ( ( eLastChild = eLastChild.lastChild ) )
-                        {
-                                // Check the following:
-                                //              1. Is there more than one node in the parents children?
-                                //              2. Is the node not an element node?
-                                //              3. Is it not a inline element.
-                                if ( eLastChild.previousSibling || eLastChild.nodeType != 1 || FCKListsLib.InlineChildReqElements[ eLastChild.nodeName.toLowerCase() ] == null )
-                                {
-                                        // So we are not in the end of the range.
-                                        bIsEndOfBlock = false ;
-                                        break ;
-                                }
-                        }
+                        bIsEndOfBlock = oTestRange.CheckIsEmpty( true );
                 }
 
                 oTestRange.Release() ;