Ticket #7646: 7646.patch

_source/plugins/pastefromword/filter/default.js

@@ -1290 +1290 @@
                 }
         };
 
+        function finalCleanup( data )
+        {
+                var fragment = CKEDITOR.htmlParser.fragment.fromHtml( data, false ),
+                        filter = new CKEDITOR.htmlParser.filter(),
+                        writer = new CKEDITOR.htmlParser.basicWriter();
+
+                filter.addRules(
+                        {
+                                attributeNames :
+                                [
+                                        // Remove onmouseover and onmouseout events (from MS Word comments effect)
+                                        [ ( /^cke:.*/ ), '' ]
+                                ],
+                                attributes :
+                                {
+                                        'style' : function( value )
+                                        {
+                                                if ( !value )
+                                                        return false;
+                                        }
+                                },
+                                elements :
+                                {
+                                        'span' : function( element )
+                                        {
+                                                // Remove dummy spans (attribute-less).
+                                                if ( CKEDITOR.tools.isEmpty( element.attributes ) )
+                                                        element.name = '';
+                                        }
+                                }
+                        });
+
+                fragment.writeHtml( writer, filter );
+
+                return writer.getHtml( true );
+        }
+
         CKEDITOR.cleanWord = function( data, editor )
         {
                 // Firefox will be confused by those downlevel-revealed IE conditional
@@ -1310 +1347 @@
                 try
                 {
                         data = dataProcessor.toHtml( data, false );
+
+                        /* A second round of processing is needed to cleanup undesirable results of the main filtering. */
+                        data = finalCleanup( data );
                 }
                 catch ( e )
                 {
                         alert( editor.lang.pastefromword.error );
                 }
 
-                /* Below post processing those things that are unable to delivered by filter rules. */
-
-                // Remove 'cke' namespaced attribute used in filter rules as marker.
-                data = data.replace( /cke:.*?".*?"/g, '' );
-
-                // Remove empty style attribute.
-                data = data.replace( /style=""/g, '' );
-
-                // Remove the dummy spans ( having no inline style ).
-                data = data.replace( /<span>/g, '' );
-
                 return data;
         };
 })();