vanilla ckeditor-3.6.6.1

[ckeditor.git] / _source / plugins / htmldataprocessor / plugin.js

diff --git a/_source/plugins/htmldataprocessor/plugin.js b/_source/plugins/htmldataprocessor/plugin.js
index ad6fa47..2bf39af 100644 (file)
--- a/_source/plugins/htmldataprocessor/plugin.js
+++ b/_source/plugins/htmldataprocessor/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -21,6 +21,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                return last;\r
        }\r
 \r
+       function getNodeIndex( node ) {\r
+               var parent = node.parent;\r
+               return parent ? CKEDITOR.tools.indexOf( parent.children, node ) : -1;\r
+       }\r
+\r
        function trimFillers( block, fromSource )\r
        {\r
                // If the current node is a block, and if we're converting from source or\r
@@ -44,14 +49,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        typeof extendEmptyBlock == 'function' && ( extendEmptyBlock( block ) === false ) ) )\r
                        return false;\r
 \r
-        // 1. For IE version >=8,  empty blocks are displayed correctly themself in wysiwiyg;\r
-        // 2. For the rest, at least table cell and list item need no filler space.\r
-        // (#6248)\r
-        if ( fromSource && CKEDITOR.env.ie &&\r
-                ( document.documentMode > 7\r
-                || block.name in CKEDITOR.dtd.tr\r
-                || block.name in CKEDITOR.dtd.$listItem ) )\r
-            return false;\r
+       // 1. For IE version >=8,  empty blocks are displayed correctly themself in wysiwiyg;\r
+       // 2. For the rest, at least table cell and list item need no filler space.\r
+       // (#6248)\r
+       if ( fromSource && CKEDITOR.env.ie &&\r
+               ( document.documentMode > 7\r
+                       || block.name in CKEDITOR.dtd.tr\r
+                       || block.name in CKEDITOR.dtd.$listItem ) )\r
+               return false;\r
 \r
                var lastChild = lastNoneSpaceChild( block );\r
 \r
@@ -159,12 +164,29 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                // The contents of table should be in correct order (#4809).\r
                                table : function( element )\r
                                {\r
-                                       var children = element.children;\r
+                                       // Clone the array as it would become empty during the sort call.\r
+                                       var children = element.children.slice( 0 );\r
                                        children.sort( function ( node1, node2 )\r
                                                                   {\r
-                                                                          return node1.type == CKEDITOR.NODE_ELEMENT && node2.type == node1.type ?\r
-                                                                                       CKEDITOR.tools.indexOf( tableOrder, node1.name )  > CKEDITOR.tools.indexOf( tableOrder, node2.name ) ? 1 : -1 : 0;\r
-                                                                  } );\r
+                                                                                var index1, index2;\r
+\r
+                                                                                // Compare in the predefined order.\r
+                                                                                if ( node1.type == CKEDITOR.NODE_ELEMENT &&\r
+                                                                                                       node2.type == node1.type )\r
+                                                                                {\r
+                                                                                        index1 = CKEDITOR.tools.indexOf( tableOrder, node1.name );\r
+                                                                                        index2 = CKEDITOR.tools.indexOf( tableOrder, node2.name );\r
+                                                                                }\r
+\r
+                                                                                // Make sure the sort is stable, if no order can be established above.\r
+                                                                                if ( !( index1 > -1 && index2 > -1 && index1 != index2 ) )\r
+                                                                                {\r
+                                                                                        index1 = getNodeIndex( node1 );\r
+                                                                                        index2 = getNodeIndex( node2 );\r
+                                                                                }\r
+\r
+                                                                                return index1 > index2 ? 1 : -1;\r
+                                                                        } );\r
                                },\r
 \r
                                embed : function( element )\r
@@ -288,8 +310,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                defaultHtmlFilterRules.elements[ i ] = unprotectReadyOnly;\r
        }\r
 \r
-       var protectElementRegex = /<(a|area|img|input)\b([^>]*)>/gi,\r
-               protectAttributeRegex = /\b(href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi;\r
+       var protectElementRegex = /<(a|area|img|input|source)\b([^>]*)>/gi,\r
+               protectAttributeRegex = /\b(on\w+|href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi;\r
 \r
        var protectElementsRegex = /(?:<style(?=[ >])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,\r
                encodedElementsRegex = /<cke:encoded>([^<]*)<\/cke:encoded>/gi;\r
@@ -305,9 +327,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                {\r
                        return '<' +  tag + attributes.replace( protectAttributeRegex, function( fullAttr, attrName )\r
                        {\r
+                               // Avoid corrupting the inline event attributes (#7243).\r
                                // We should not rewrite the existed protected attributes, e.g. clipboard content from editor. (#5218)\r
-                               if ( attributes.indexOf( 'data-cke-saved-' + attrName ) == -1 )\r
-                                       return ' data-cke-saved-' + fullAttr + ' ' + fullAttr;\r
+                               if ( !( /^on/ ).test( attrName ) && attributes.indexOf( 'data-cke-saved-' + attrName ) == -1 )\r
+                                       return ' data-cke-saved-' + fullAttr + ' data-cke-' + CKEDITOR.rnd + '-' + fullAttr;\r
 \r
                                return fullAttr;\r
                        }) + '>';\r
@@ -515,10 +538,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        // Call the browser to help us fixing a possibly invalid HTML\r
                        // structure.\r
                        var div = new CKEDITOR.dom.element( 'div' );\r
+\r
                        // Add fake character to workaround IE comments bug. (#3801)\r
                        div.setHtml( 'a' + data );\r
                        data = div.getHtml().substr( 1 );\r
 \r
+                       // Restore shortly protected attribute names.\r
+                       data = data.replace( new RegExp( ' data-cke-' + CKEDITOR.rnd + '-', 'ig' ), ' ' );\r
+\r
                        // Unprotect "some" of the protected elements at this point.\r
                        data = unprotectElementNames( data );\r
 \r