Ticket #2962: 2962_2.patch

_source/plugins/link/dialogs/link.js

@@ -128 +128 @@
                         // IE BUG: target attribute is an empty string instead of null in IE if it's not set.
                         if ( !target )
                         {
-                                var onclick = element.getAttribute( '_cke_saved_onclick' ) || element.getAttribute( 'onclick' ),
+                                var onclick = element.getAttribute( '_cke_pa_onclick' ) || element.getAttribute( 'onclick' ),
                                         onclickMatch = onclick && onclick.match( popupRegex );
                                 if ( onclickMatch )
                                 {
@@ -1057 +1057 @@
                                         addFeature( 'top' );
 
                                         onclickList.push( featureList.join( ',' ), '\'); return false;' );
-                                        attributes._cke_saved_onclick = onclickList.join( '' );
+                                        attributes[ CKEDITOR.env.ie || CKEDITOR.env.webkit ? '_cke_pa_onclick' : 'onclick' ] = onclickList.join( '' );
                                 }
                                 else
                                 {
                                         if ( data.target.type != 'notSet' && data.target.name )
                                                 attributes.target = data.target.name;
-                                        removeAttributes.push( '_cke_saved_onclick', 'onclick' );
+                                        removeAttributes.push( '_cke_pa_onclick', 'onclick' );
                                 }
                         }
 

_source/core/htmlparser/element.js

@@ -67 +67 @@
         };
 
         var ckeAttrRegex = /^_cke/,
-                ckeClassRegex = /(^|\s+)cke_[^\s]*/g;
+                ckeClassRegex = /(^|\s+)cke_[^\s]*/g,
+                ckePrivateAttrRegex = /^_cke_pa_/;
 
         CKEDITOR.htmlParser.element.prototype =
         {
@@ -132 +133 @@
                         var attribsArray = [];
                         for ( var a in attributes )
                         {
+                                var value = attributes[ a ];
+
+                                // If the attribute name is _cke_pa_*, strip away the _cke_pa part.
+                                a = a.replace( ckePrivateAttrRegex, '' );
+
                                 // Ignore all attributes starting with "_cke".
                                 if ( ckeAttrRegex.test( a ) )
                                         continue;
@@ -139 +145 @@
                                 // Ignore all cke_* CSS classes.
                                 if ( a.toLowerCase() == 'class' )
                                 {
-                                        this.attributes[ a ] = CKEDITOR.tools.ltrim( this.attributes[ a ].replace( ckeClassRegex, '' ) );
-                                        if ( this.attributes[ a ] == '' )
+                                        value = CKEDITOR.tools.ltrim( value.replace( ckeClassRegex, '' ) );
+                                        if ( value == '' )
                                                 continue;
                                 }
 
-                                attribsArray.push( [ a, this.attributes[ a ] ] );
+                                attribsArray.push( [ a, value ] );
                         }
 
                         // Sort the attributes by name.