vanilla ckeditor-3.4.2

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

diff --git a/_source/plugins/htmldataprocessor/plugin.js b/_source/plugins/htmldataprocessor/plugin.js
index ad3852d..f8cf91d 100644 (file)
--- a/_source/plugins/htmldataprocessor/plugin.js
+++ b/_source/plugins/htmldataprocessor/plugin.js
@@ -201,7 +201,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                                title : function( element )\r
                                {\r
-                                       element.children[ 0 ].value = element.attributes[ '_cke_title' ];\r
+                                       var titleText = element.children[ 0 ];\r
+                                       titleText && ( titleText.value = element.attributes[ '_cke_title' ] || '' );\r
                                }\r
                        },\r
 \r
@@ -262,7 +263,8 @@ 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)[\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
                encodedElementsRegex = /<cke:encoded>([^<]*)<\/cke:encoded>/gi;\r
@@ -274,7 +276,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
        function protectAttributes( html )\r
        {\r
-               return html.replace( protectAttributeRegex, '$& _cke_saved_$1' );\r
+               return html.replace( protectAttributeRegex, function( tag, beginning, fullAttr, attrName, end )\r
+                       {\r
+                               // We should not rewrite the _cke_saved_src attribute (#5218)\r
+                               if ( attrName == 'src' && findSavedSrcRegex.test( tag ) )\r
+                                       return tag;\r
+                               else\r
+                                       return '<' + beginning + fullAttr + ' _cke_saved_' + fullAttr + end + '>';\r
+                       });\r
        }\r
 \r
        function protectElements( html )\r
@@ -308,6 +317,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                return html.replace( protectSelfClosingRegex, '<cke:$1$2></cke:$1>' );\r
        }\r
 \r
+       function protectPreFormatted( html )\r
+       {\r
+               return html.replace( /(<pre\b[^>]*>)(\r\n|\n)/g, '$1$2$2' );\r
+       }\r
+\r
        function protectRealComments( html )\r
        {\r
                return html.replace( /<!--(?!{cke_protected})[\s\S]+?-->/g, function( match )\r
@@ -428,6 +442,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        // protecting them into open-close. (#3591)\r
                        data = protectSelfClosingElements( data );\r
 \r
+                       // Compensate one leading line break after <pre> open as browsers\r
+                       // eat it up. (#5789)\r
+                       data = protectPreFormatted( data );\r
+\r
                        // Call the browser to help us fixing a possibly invalid HTML\r
                        // structure.\r
                        var div = new CKEDITOR.dom.element( 'div' );\r
@@ -482,4 +500,3 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  * @example\r
  * config.forceSimpleAmpersand = false;\r
  */\r
-CKEDITOR.config.forceSimpleAmpersand = false;\r