Ticket #7646: 7646_3.patch

_source/core/htmlparser/cdata.js

@@ -33 +33 @@
 
                 /**
                  * Writes write the CDATA with no special manipulations.
-                 * @param {CKEDITOR.htmlWriter} writer The writer to which write the HTML.
+                 * @param {CKEDITOR.htmlWriter} [writer] The writer to which write the HTML.
                  */
                 writeHtml : function( writer )
                 {
-                        writer.write( this.value );
+                        writer && writer.write( this.value );
                 }
         };
 })();

_source/core/htmlparser/fragment.js

@@ -513 +513 @@
                 {
                         for ( var i = 0 ; i < this.children.length ; i++ )
                                 this.children[i].writeHtml( writer, filter );
+                },
+
+                /**
+                 * Dry-run the specified filter on this node and its children without outputting.
+                 * @see {#writeHtml}
+                 * @param filter {CKEDITOR.htmlParser.filter}
+                 */
+                filterHtml : function( filter )
+                {
+                        this.writeHtml( null, filter );
                 }
         };
+
+
 })();

_source/core/htmlparser/comment.js

@@ -35 +35 @@
 
         /**
          * Writes the HTML representation of this comment to a CKEDITOR.htmlWriter.
-         * @param {CKEDITOR.htmlWriter} writer The writer to which write the HTML.
+         * @param {CKEDITOR.htmlWriter} [writer] The writer to which write the HTML.
          * @example
          */
         writeHtml : function( writer, filter )
@@ -53 +53 @@
                                 comment.writeHtml( writer, filter );
                                 return;
                         }
+
+                        // Update node in case of filter dry-run.
+                        this.value = comment;
                 }
 
-                writer.comment( comment );
+                writer && writer.comment( comment );
         }
 };

_source/core/htmlparser/element.js

@@ -191 +191 @@
                         {
                                 while ( true )
                                 {
-                                        if ( !( writeName = filter.onElementName( writeName ) ) )
-                                                return;
+                                        if ( writeName )
+                                        {
+                                                if ( !( writeName = filter.onElementName( writeName ) ) )
+                                                        return;
 
-                                        element.name = writeName;
+                                                element.name = writeName;
 
-                                        if ( !( element = filter.onElement( element ) ) )
-                                                return;
+                                                if ( !( element = filter.onElement( element ) ) )
+                                                        return;
 
-                                        element.parent = this.parent;
+                                                element.parent = this.parent;
 
-                                        if ( element.name == writeName )
-                                                break;
+                                                if ( element.name == writeName )
+                                                        break;
 
-                                        // If the element has been replaced with something of a
-                                        // different type, then make the replacement write itself.
-                                        if ( element.type != CKEDITOR.NODE_ELEMENT )
-                                        {
-                                                element.writeHtml( writer, filter );
-                                                return;
-                                        }
+                                                // If the element has been replaced with something of a
+                                                // different type, then make the replacement write itself.
+                                                if ( element.type != CKEDITOR.NODE_ELEMENT )
+                                                {
+                                                        element.writeHtml( writer, filter );
+                                                        return;
+                                                }
+                                        }
 
                                         writeName = element.name;
 
@@ -233 +236 @@
                         }
 
                         // Open element tag.
-                        writer.openTag( writeName, attributes );
+                        writer && writer.openTag( writeName, attributes );
 
                         // Copy all attributes to an array.
                         var attribsArray = [];
@@ -275 +278 @@
                                         }
                                 }
                         }
-                        // Sort the attributes by name.
-                        if ( writer.sortAttributes )
-                                attribsArray.sort( sortAttribs );
+
+                        if ( writer )
+                        {
+                                // Sort the attributes by name.
+                                if ( writer.sortAttributes )
+                                        attribsArray.sort( sortAttribs );
 
-                        // Send the attributes.
-                        var len = attribsArray.length;
-                        for ( i = 0 ; i < len ; i++ )
-                        {
-                                var attrib = attribsArray[ i ];
-                                writer.attribute( attrib[0], attrib[1] );
-                        }
+                                // Send the attributes.
+                                var len = attribsArray.length;
+                                for ( i = 0; i < len; i++ )
+                                {
+                                        var attrib = attribsArray[ i ];
+                                        writer.attribute( attrib[0], attrib[1] );
+                                }
 
-                        // Close the tag.
-                        writer.openTagClose( writeName, element.isEmpty );
+                                // Close the tag.
+                                writer.openTagClose( writeName, element.isEmpty );
+                        }
 
                         if ( !element.isEmpty )
                         {
                                 this.writeChildrenHtml.call( element, writer, isChildrenFiltered ? null : filter );
                                 // Close the element.
-                                writer.closeTag( writeName );
+                                writer && writer.closeTag( writeName );
                         }
                 },
 
@@ -303 +310 @@
                         // Send children.
                         CKEDITOR.htmlParser.fragment.prototype.writeChildrenHtml.apply( this, arguments );
 
-                }
+                },
+
+                /**
+                 * @see CKEDITOR.htmlParser.fragment.prototype.filterHtml
+                 */
+                filterHtml : CKEDITOR.htmlParser.fragment.prototype.filterHtml
         };
 })();

_source/plugins/htmldataprocessor/plugin.js

@@ -487 +487 @@
         {
                 toHtml : function( data, fixForBody )
                 {
+                        // Fire "beforeProcessData" so data manipulation may happen.
+                        var eventData = { data : data };
+                        this.editor.fire( 'beforeProcessData', eventData );
+                        data = eventData.data;
+
                         // The source data is already HTML, but we need to clean
                         // it up and apply the filter.
 
@@ -539 +544 @@
 
                         // Now use our parser to make further fixes to the structure, as
                         // well as apply the filter.
-                        var fragment = CKEDITOR.htmlParser.fragment.fromHtml( data, fixForBody ),
-                                writer = new CKEDITOR.htmlParser.basicWriter();
+                        var fragment = CKEDITOR.htmlParser.fragment.fromHtml( data, fixForBody );
 
+                        // Fire "beforeFilterData" to allow pre-filtering with custom rules.
+                        this.editor.fire( 'beforeFilterData', { fragment : fragment } );
+
+                        // Run through the default filters.
+                        var writer = new CKEDITOR.htmlParser.basicWriter();
                         fragment.writeHtml( writer, this.dataFilter );
                         data = writer.getHtml( true );
 
@@ -553 +562 @@
 
                 toDataFormat : function( html, fixForBody )
                 {
+                        // Fire "beforeProcessHtml" so data manipulation may happen.
+                        var eventData = { html : html };
+                        this.editor.fire( 'beforeProcessHtml', eventData );
+                        html = eventData.html;
+
                         var writer = this.writer,
                                 fragment = CKEDITOR.htmlParser.fragment.fromHtml( html, fixForBody );
+
+                        // Fire "beforeFilterHtml" to allow pre-filtering with custom rules.
+                        this.editor.fire( 'beforeFilterHtml', { fragment : fragment } );
 
                         writer.reset();
 

_source/plugins/pastefromword/filter/default.js

@@ -1272 +1272 @@
                 }
         });
 
-        // The paste processor here is just a reduced copy of html data processor.
-        var pasteProcessor = function()
+        // These are instance-irrelevant rules for post cleanup which are applied afterward.
+        var cleanupFilter = new CKEDITOR.htmlParser.filter();
+        cleanupFilter.addRules(
         {
-                this.dataFilter = new CKEDITOR.htmlParser.filter();
-        };
-
-        pasteProcessor.prototype =
-        {
-                toHtml : function( data )
-                {
-                        var fragment = CKEDITOR.htmlParser.fragment.fromHtml( data, false ),
-                                writer = new CKEDITOR.htmlParser.basicWriter();
-
-                        fragment.writeHtml( writer, this.dataFilter );
-                        return writer.getHtml( true );
-                }
-        };
+                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 = '';
+                        }
+                }
+        });
 
         CKEDITOR.cleanWord = function( data, editor )
         {
-                // Firefox will be confused by those downlevel-revealed IE conditional
-                // comments, fixing them first( convert it to upperlevel-revealed one ).
-                // e.g. <![if !vml]>...<![endif]>
-                if ( CKEDITOR.env.gecko )
-                        data = data.replace( /(<!--\[if[^<]*?\])-->([\S\s]*?)<!--(\[endif\]-->)/gi, '$1$2$3' );
+                // These rules are instance related logic that converting MS-HTML to html.
+                var defaultFilter = new CKEDITOR.htmlParser.filter();
+                defaultFilter.addRules( CKEDITOR.plugins.pastefromword.getRules( editor ) );
 
-                var dataProcessor = new pasteProcessor(),
-                        dataFilter = dataProcessor.dataFilter;
+                editor.on( 'beforeFilterData', function( evt )
+                {
+                        // Just for this run.
+                        evt.removeListener();
 
-                // These rules will have higher priorities than default ones.
-                dataFilter.addRules( CKEDITOR.plugins.pastefromword.getRules( editor ) );
+                        var fragment = evt.data.fragment;
 
-                // Allow extending data filter rules.
-                editor.fire( 'beforeCleanWord', { filter : dataFilter } );
+                        // Allow extending data filter rules.
+                        editor.fire( 'beforeCleanWord', { filter : defaultFilter } );
 
-                try
-                {
-                        data = dataProcessor.toHtml( data, false );
-                }
-                catch ( e )
-                {
-                        alert( editor.lang.pastefromword.error );
-                }
+                        fragment.filterHtml( defaultFilter );
+                        fragment.filterHtml( cleanupFilter );
+                } );
 
-                /* 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, '' );
+                // Firefox will be confused by those downlevel-revealed IE conditional
+                // comments, fixing them first( convert it to upperlevel-revealed one ).
+                // e.g. <![if !vml]>...<![endif]>
+                if ( CKEDITOR.env.gecko )
+                        data = data.replace( /(<!--\[if[^<]*?\])-->([\S\s]*?)<!--(\[endif\]-->)/gi, '$1$2$3' );
 
                 return data;
         };

_source/core/htmlparser/text.js

@@ -44 +44 @@
                 {
                         var text = this.value;
 
-                        if ( filter && !( text = filter.onText( text, this ) ) )
-                                return;
+                        if ( filter )
+                        {
+                                if ( !( text = filter.onText( text, this ) ) )
+                                        return;
 
-                        writer.text( text );
+                                // Update node in case of filter dry-run.
+                                this.value = text;
+                        }
+
+                        writer && writer.text( text );
                 }
         };
 })();