Ticket #7243: 7243.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -44 +44 @@
                         typeof extendEmptyBlock == 'function' && ( extendEmptyBlock( block ) === false ) ) )
                         return false;
 
-        // 1. For IE version >=8,  empty blocks are displayed correctly themself in wysiwiyg;
-        // 2. For the rest, at least table cell and list item need no filler space.
-        // (#6248)
-        if ( fromSource && CKEDITOR.env.ie &&
-                ( document.documentMode > 7
-                || block.name in CKEDITOR.dtd.tr
-                || block.name in CKEDITOR.dtd.$listItem ) )
-            return false;
+        // 1. For IE version >=8,  empty blocks are displayed correctly themself in wysiwiyg;
+        // 2. For the rest, at least table cell and list item need no filler space.
+        // (#6248)
+        if ( fromSource && CKEDITOR.env.ie &&
+                ( document.documentMode > 7
+                        || block.name in CKEDITOR.dtd.tr
+                        || block.name in CKEDITOR.dtd.$listItem ) )
+                return false;
 
                 var lastChild = lastNoneSpaceChild( block );
 
@@ -289 +289 @@
         }
 
         var protectElementRegex = /<(a|area|img|input)\b([^>]*)>/gi,
-                protectAttributeRegex = /\b(href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi;
+                protectAttributeRegex = /\b(on\w+|href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi;
 
         var protectElementsRegex = /(?:<style(?=[ >])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,
                 encodedElementsRegex = /<cke:encoded>([^<]*)<\/cke:encoded>/gi;
@@ -305 +305 @@
                 {
                         return '<' +  tag + attributes.replace( protectAttributeRegex, function( fullAttr, attrName )
                         {
+                                // Avoid corrupting the inline event attributes (#7243).
                                 // We should not rewrite the existed protected attributes, e.g. clipboard content from editor. (#5218)
-                                if ( attributes.indexOf( 'data-cke-saved-' + attrName ) == -1 )
+                                if ( !/^on/.test( attrName ) && attributes.indexOf( 'data-cke-saved-' + attrName ) == -1 )
                                         return ' data-cke-saved-' + fullAttr + ' ' + fullAttr;
 
                                 return fullAttr;