Ticket #5455: 5455_5.patch

_source/core/dom/element.js

@@ -850 +850 @@
                         :
                                 function()
                                 {
-                                        var attributes = this.$.attributes;
-                                        return ( attributes.length > 1 || ( attributes.length == 1 && attributes[0].nodeName != '_cke_expando' ) );
+                                        var attrs = this.$.attributes,
+                                                attrsNum = attrs.length,
+                                                // The _moz_dirty attribute might get into the element after pasting (#5455)
+                                                execludeAttrs = { _cke_expando : 1, _moz_dirty : 1 };
+                                        if ( attrsNum == 1 && execludeAttrs[ attrs[0].nodeName ] )
+                                                return false;
+                                        else if ( attrsNum == 2 && execludeAttrs[ attrs[0].nodeName ] && execludeAttrs[ attrs[1].nodeName ] )
+                                                return false;
+                                        return attrsNum > 0;
                                 },
 
                 /**

_source/plugins/styles/plugin.js

@@ -1030 +1030 @@
                 {
                         // Removing elements may open points where merging is possible,
                         // so let's cache the first and last nodes for later checking.
-                        var firstChild  = element.getFirst();
-                        var lastChild   = element.getLast();
+                        var firstChild = element.getFirst(),
+                                lastChild = element.getLast();
 
                         element.remove( true );
 
@@ -1041 +1041 @@
                                 firstChild.type == CKEDITOR.NODE_ELEMENT && firstChild.mergeSiblings();
 
                                 if ( lastChild && !firstChild.equals( lastChild )
-                                        && lastChild.type == CKEDITOR.NODE_ELEMENT  )
+                                        && lastChild.type == CKEDITOR.NODE_ELEMENT )
                                         lastChild.mergeSiblings();
                         }
                 }
+                // We intend to remove the element while still have attributes left on it,
+                // migrate them it into a span (without additional semantics) element instead.
+                else
+                {
+                        var replacement = new CKEDITOR.dom.element( 'span' );
+                        element.copyAttributes( replacement, { _cke_expando : 1, _moz_dirty : 1 } );
+                        element.moveChildren( replacement );
+                        replacement.replace( element );
+                        replacement.mergeSiblings();
+                }
         }
 
         function getElement( style, targetDocument )