Ticket #3591: 3591_3.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -7 +7 @@
 {
         var defaultDataFilterRules =
         {
-                elementNames :
-                [
-                        // Elements that cause problems in wysiwyg mode.
-                        [ ( /^(object|embed|param)$/ ), 'cke:$1' ]
-                ],
-
                 attributeNames :
                 [
                         // Event attributes (onXYZ) must not be directly set. They can become
@@ -56 +50 @@
                                         }
                                 },
 
+                                // Restore param elements into self-closing. 
+                                param : function( param )
+                                {
+                                        param.children = [];
+                                        param.isEmpty = true;
+                                        return param;
+                                },
+
                                 img : function( element )
                                 {
                                         var attribs = element.attributes;
@@ -105 +107 @@
         }
 
         var protectAttributeRegex = /<(?:a|area|img|input).*?\s((?:href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))/gi;
-
+        var protectElementNamesRegex = /(<[/]?)(object|embed|param)(.*?>)/gi;
+        var protectSelfClosingRegex = /(<)(cke:param)(.*?)\/(>)/gi;
         function protectAttributes( html )
         {
                 return html.replace( protectAttributeRegex, '$& _cke_saved_$1' );
         }
-
+        function protectElementsNames( html )
+        {
+                return html.replace( protectElementNamesRegex, '$1cke:$2$3');
+        }
+        function protectSelfClosingElements( html )
+        {
+                return html.replace( protectSelfClosingRegex, '$1$2$3$4 $1/$2$4' );
+        }
         CKEDITOR.plugins.add( 'htmldataprocessor',
         {
                 requires : [ 'htmlwriter' ],
@@ -145 +155 @@
                         // the code.
                         data = protectAttributes( data );
 
+                        // Certain elements has problem during native DOM operation, we transform them into
+                        // their 'agent' intead, prefixing with 'cke:' to become a custom element.
+                        data = protectElementsNames( data );
+
+                        // All none-IE browsers don't accept self-closed custom elements, treating them as
+                        // an open tag, now converting them to avoid ambiguous.
+                        data = protectSelfClosingElements( data );
+
                         // Call the browser to help us fixing a possibly invalid HTML
                         // structure.
-                        var div = document.createElement( 'div' );
+                        var div = document.createElement( 'body' );
                         div.innerHTML = data;
 
                         // Now use our parser to make further fixes to the structure, as