Ticket #2203: fckstyles.patch

fckstyle.js

@@ -1 @@
-/*
+/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
@@ -695 +695 @@
 
         _CompareAttributeValues : function( attName, valueA, valueB )
         {
+                var matchedStyle = false;
+                
                 if ( attName == 'style' && valueA && valueB )
                 {
                         valueA = valueA.replace( /;$/, '' ).toLowerCase() ;
                         valueB = valueB.replace( /;$/, '' ).toLowerCase() ;
+                        matchedStyle = valueA.indexOf( valueB ) >= 0 ? true : false ;
                 }
-
+                
                 // Return true if they match or if valueA is null and valueB is an empty string
-                return ( valueA == valueB || ( ( valueA === null || valueA === '' ) && ( valueB === null || valueB === '' ) ) )
+                return ( matchedStyle || valueA == valueB || ( ( valueA === null || valueA === '' ) && ( valueB === null || valueB === '' ) ) )
         },
 
         GetFinalAttributeValue : function( attName )
@@ -1162 +1165 @@
 
                                         // Let's merge our new style with its neighbors, if possible.
                                         this._MergeSiblings( styleNode, this._GetAttribsForComparison() ) ;
+                                        
+                                        // In the case of span tags merge with child nodes to prevent duplication
+                                        this._MergeChildren( styleNode ) ;
+                                        
 
                                         // As the style system breaks text nodes constantly, let's normalize
                                         // things for performance.
@@ -1218 +1225 @@
                         break ;
                 }
         },
+        
+        /**
+         * Merge an element with its similar children.
+         */
+        _MergeChildren : function( element )
+        {
+                if ( !element || element.nodeType != 1 || !FCKListsLib.InlineNonEmptyElements[ element.nodeName.toLowerCase() ] )
+                        return ;
 
+                this._MergeFirstChild( element ) ;
+                this._MergeLastChild( element ) ;
+        },
+        
+        _MergeFirstChild : function ( element )
+        {
+                var child = element.firstChild ;
+                
+                if ( child && child.nodeType == 1 && child.nodeName == element.nodeName && child.nextSibling == null)
+                {
+                        // Get the style of the element to merge to  
+                        var mergeStyle = child.style.cssText; 
+
+                        // IE doesn't return a ";" when asking for a style so we add it here. 
+                        if ( mergeStyle.charAt(mergeStyle.length - 1) != ";" ) { mergeStyle += ";"; } 
+
+                        // add the selected texts style to the new node
+                        element.style.cssText = mergeStyle + element.style.cssText; 
+
+                        // Move contents from the 
+                        FCKDomTools.MoveChildren( child, element ) ;
+                        FCKDomTools.RemoveNode( child ) ;
+                }
+        },
+        
+        _MergeLastChild : function ( element )
+        {
+                var child = element.lastChild ;
+                
+                if ( child && child.nodeType == 1 && child.nodeName == element.nodeName && child.previousSibling == null)
+                {
+                        // Get the style of the element to merge to  
+                        var mergeStyle = child.style.cssText; 
+
+                        // IE doesn't return a ";" when asking for a style so we add it here. 
+                        if ( mergeStyle.charAt(mergeStyle.length - 1) != ";" ) { mergeStyle += ";"; } 
+
+                        // add the selected texts style to the new node
+                        element.style.cssText = mergeStyle + element.style.cssText; 
+
+                        // Move contents from the child
+                        FCKDomTools.MoveChildren( child, element ) ;
+                        FCKDomTools.RemoveNode( child ) ;
+                }
+        },
+
         /**
          * Merge an element with its similar siblings.
          * "attribs" is and object computed with _CreateAttribsForComparison.