vanilla ckeditor-3.4.3

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

diff --git a/_source/plugins/htmldataprocessor/plugin.js b/_source/plugins/htmldataprocessor/plugin.js
index f8cf91d..7750cfc 100644 (file)
--- a/_source/plugins/htmldataprocessor/plugin.js
+++ b/_source/plugins/htmldataprocessor/plugin.js
@@ -38,8 +38,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                }\r
        }\r
 \r
-       function blockNeedsExtension( block )\r
+       function blockNeedsExtension( block, fromSource )\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
+\r
                var lastChild = lastNoneSpaceChild( block );\r
 \r
                return !lastChild\r
@@ -53,7 +62,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        {\r
                trimFillers( block, true );\r
 \r
-               if ( blockNeedsExtension( block ) )\r
+               if ( blockNeedsExtension( block, true ) )\r
                {\r
                        if ( CKEDITOR.env.ie )\r
                                block.add( new CKEDITOR.htmlParser.text( '\xa0' ) );\r
@@ -263,7 +272,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                defaultHtmlFilterRules.elements[ i ] = unprotectReadyOnly;\r
        }\r
 \r
-       var protectAttributeRegex = /<((?:a|area|img|input)[\s\S]*?\s)((href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))([^>]*)>/gi,\r
+       var protectAttributeRegex = /<((?:a|area|img|input)\b[\s\S]*?\s)((href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))([^>]*)>/gi,\r
                findSavedSrcRegex = /\s_cke_saved_src\s*=/;\r
 \r
        var protectElementsRegex = /(?:<style(?=[ >])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,\r
@@ -492,9 +501,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
 /**\r
  * Whether to force using "&" instead of "&amp;amp;" in elements attributes\r
- * values. It's not recommended to change this setting for compliance with the\r
- * W3C XHTML 1.0 standards\r
- * (<a href="http://www.w3.org/TR/xhtml1/#C_12">C.12, XHTML 1.0</a>).\r
+ * values, it's not recommended to change this setting for compliance with the\r
+ * W3C XHTML 1.0 standards (<a href="http://www.w3.org/TR/xhtml1/#C_12">C.12, XHTML 1.0</a>).\r
+ * @name CKEDITOR.config.forceSimpleAmpersand\r
  * @type Boolean\r
  * @default false\r
  * @example\r