Ticket #6665: 6665_3.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -92 +92 @@
         delete blockLikeTags.pre;
         var defaultDataFilterRules =
         {
-                elements : {},
+                elements : {
+                        a : function( element )
+                        {
+                                var attrs = element.attributes;
+                                if ( attrs && attrs[ 'data-cke-saved-name' ] )
+                                        attrs[ 'class' ] = ( attrs[ 'class' ] ? attrs[ 'class' ] + ' ' : '' ) + 'cke_anchor';
+                        }
+                },
                 attributeNames :
                 [
                         // Event attributes (onXYZ) must not be directly set. They can become
@@ -288 +295 @@
                 defaultHtmlFilterRules.elements[ i ] = unprotectReadyOnly;
         }
 
-        var protectAttributeRegex = /<((?:a|area|img|input)\b[\s\S]*?\s)((href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+)))([^>]*)>/gi,
-                findSavedSrcRegex = /\sdata-cke-saved-src\s*=/;
+        var protectElementRegex = /<(a|area|img|input)\b([^>]*)>/gi,
+                protectAttributeRegex = /\b(href|src|name)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi;
 
         var protectElementsRegex = /(?:<style(?=[ >])[^>]*>[\s\S]*<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,
                 encodedElementsRegex = /<cke:encoded>([^<]*)<\/cke:encoded>/gi;
@@ -301 +308 @@
 
         function protectAttributes( html )
         {
-                return html.replace( protectAttributeRegex, function( tag, beginning, fullAttr, attrName, end )
-                        {
-                                // We should not rewrite the _cke_saved_src attribute (#5218)
-                                if ( attrName == 'src' && findSavedSrcRegex.test( tag ) )
-                                        return tag;
-                                else
-                                        return '<' + beginning + fullAttr + ' data-cke-saved-' + fullAttr + end + '>';
-                        });
+                return html.replace( protectElementRegex, function( element, tag, attributes )
+                {
+                        return '<' +  tag + attributes.replace( protectAttributeRegex, function( fullAttr, attrName )
+                        {
+                                // We should not rewrite the existed protected attributes, e.g. clipboard content from editor. (#5218)
+                                if ( attributes.indexOf( 'data-cke-saved-' + attrName ) == -1 )
+                                        return ' data-cke-saved-' + fullAttr + ' ' + fullAttr;
+
+                                return fullAttr;
+                        }) + '>';
+                });
         }
 
         function protectElements( html )

_source/plugins/link/dialogs/link.js

@@ -225 +225 @@
                         advAttr( 'advId', 'id' );
                         advAttr( 'advLangDir', 'dir' );
                         advAttr( 'advAccessKey', 'accessKey' );
-                        advAttr( 'advName', 'name' );
+
+                        retval.adv.advName =
+                                element.data( 'cke-saved-name' )
+                                || element.getAttribute( 'name' )
+                                || '';
                         advAttr( 'advLangCode', 'lang' );
                         advAttr( 'advTabIndex', 'tabindex' );
                         advAttr( 'advTitle', 'title' );
@@ -1286 +1290 @@
                                 advAttr( 'advId', 'id' );
                                 advAttr( 'advLangDir', 'dir' );
                                 advAttr( 'advAccessKey', 'accessKey' );
-                                advAttr( 'advName', 'name' );
+
+                                if ( data.adv[ 'advName' ] )
+                                {
+                                        attributes[ 'name' ] = attributes[ 'data-cke-saved-name' ] = data.adv[ 'advName' ];
+                                        attributes[ 'class' ] = ( attributes[ 'class' ] ? attributes[ 'class' ] + ' ' : '' ) + 'cke_anchor';
+                                }
+                                else
+                                        removeAttributes = removeAttributes.concat( [ 'data-cke-saved-name', 'name' ] );
+
                                 advAttr( 'advLangCode', 'lang' );
                                 advAttr( 'advTabIndex', 'tabindex' );
                                 advAttr( 'advTitle', 'title' );