Ticket #3560: 3560_2.patch

_source/core/htmlparser/element.js

@@ -128 +128 @@
                                                 break;
 
                                         writeName = element.name;
+                                        if ( !writeName )       // Send children.
+                                        {
+                                                CKEDITOR.htmlParser.fragment.prototype.writeHtml.apply( element, arguments );
+                                                return;
+                                        }
                                 }
 
                                 // The element may have been changed, so update the local

_source/plugins/scayt/plugin.js

@@ -77 +77 @@
                         });
 
                 // Listen to data manipulation to reflect scayt markup.
-                editor.on( 'beforeGetData', function()
-                        {
-                                if ( plugin.isScaytEnabled( editor ) )
-                                        plugin.getScayt( editor ).refresh();
-                        });
-
                 editor.on( 'afterSetData', function()
                         {
                                 if ( plugin.isScaytEnabled( editor ) )
@@ -97 +91 @@
                                 ev.data.scayt = scayt;
                         });
 
+                var dataProcessor = editor.dataProcessor,
+                        htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+                if ( htmlFilter )
+                {
+                        htmlFilter.addRules(
+                                {
+                                        elements :
+                                        {
+                                                span : function( element )
+                                                {
+                                                        if ( element.attributes.scayt_word && element.attributes.scaytid )
+                                                        {
+                                                                delete element.name;    // Write children, but don't write this node. 
+                                                                return element;
+                                                        }
+                                                }
+                                        }
+                                }
+                        );
+                }
+
                 if ( editor.document )
                 {
                         createInstnce();