Ticket #6641: 6641_3.patch

_source/plugins/image/dialogs/image.js

@@ -1102 +1102 @@
                                                                 {
                                                                         if ( this.getValue() || this.isChanged() )
                                                                         {
-                                                                                element.data( 'cke-saved-href', decodeURI( this.getValue() ) );
-                                                                                element.setAttribute( 'href', 'javascript:void(0)/*' +
-                                                                                        CKEDITOR.tools.getNextNumber() + '*/' );
+                                                                                var url = decodeURI( this.getValue() );
+                                                                                element.data( 'cke-saved-href', url );
+                                                                                element.setAttribute( 'href', url );
 
                                                                                 if ( this.getValue() || !editor.config.image_removeLinkByEmptyURL )
                                                                                         this.getDialog().addLink = true;

_source/plugins/link/dialogs/link.js

@@ -1161 +1161 @@
                 },
                 onOk : function()
                 {
-                        var attributes = { href : 'javascript:void(0)/*' + CKEDITOR.tools.getNextNumber() + '*/' },
+                        var attributes = {},
                                 removeAttributes = [],
-                                data = { href : attributes.href },
+                                data = {},
                                 me = this,
                                 editor = this.getParentEditor();
 
@@ -1283 +1283 @@
                                                 removeAttributes.push( attrName );
                                 };
 
-                                if ( this._.selectedElement )
-                                        advAttr( 'advId', 'id' );
+                                advAttr( 'advId', 'id' );
                                 advAttr( 'advLangDir', 'dir' );
                                 advAttr( 'advAccessKey', 'accessKey' );
                                 advAttr( 'advName', 'name' );
@@ -1297 +1296 @@
                                 advAttr( 'advStyles', 'style' );
                         }
 
+
+                        // Browser need the "href" fro copy/paste link to work. (#6641)
+                        attributes.href = attributes[ 'data-cke-saved-href' ];
+
                         if ( !this._.selectedElement )
                         {
                                 // Create element if current selection is collapsed.
@@ -1316 +1319 @@
                                 var style = new CKEDITOR.style( { element : 'a', attributes : attributes } );
                                 style.type = CKEDITOR.STYLE_INLINE;             // need to override... dunno why.
                                 style.apply( editor.document );
-
-                                // Id. Apply only to the first link.
-                                if ( data.adv && data.adv.advId )
-                                {
-                                        var links = this.getParentEditor().document.$.getElementsByTagName( 'a' );
-                                        for ( i = 0 ; i < links.length ; i++ )
-                                        {
-                                                if ( links[i].href == attributes.href )
-                                                {
-                                                        links[i].id = data.adv.advId;
-                                                        break;
-                                                }
-                                        }
-                                }
                         }
                         else
                         {

_source/plugins/styles/plugin.js

@@ -1202 +1202 @@
                 if ( element )
                         element.copyAttributes( el );
 
-                return setupElement( el, style );
+                el = setupElement( el, style );
+
+                // Avoid ID duplication.
+                if ( targetDocument.getCustomData( 'doc_processing_style' ) && el.hasAttribute( 'id' ) )
+                        el.removeAttribute( 'id' );
+                else
+                        targetDocument.setCustomData( 'doc_processing_style', 1 );
+
+                return el;
         }
 
         function setupElement( el, style )
@@ -1430 +1438 @@
                 }
 
                 selection.selectRanges( ranges );
+
+                document.removeCustomData( 'doc_processing_style' );
         }
 })();