Ticket #6419: 6419_4.patch

_source/core/dom/node.js

@@ -107 +107 @@
                 {
                         var $clone = this.$.cloneNode( includeChildren );
 
-                        if ( !cloneId )
-                        {
-                                var removeIds = function( node )
-                                {
-                                        if ( node.nodeType != CKEDITOR.NODE_ELEMENT )
-                                                return;
+                        var removeIds = function( node )
+                        {
+                                if ( node.nodeType != CKEDITOR.NODE_ELEMENT )
+                                        return;
 
-                                        node.removeAttribute( 'id', false ) ;
-                                        node.removeAttribute( '_cke_expando', false ) ;
+                                if ( !cloneId )
+                                        node.removeAttribute( 'id', false );
+                                node.removeAttribute( '_cke_expando', false );
 
+                                if ( includeChildren )
+                                {
                                         var childs = node.childNodes;
-                                        for ( var i=0 ; i < childs.length ; i++ )
+                                        for ( var i=0; i < childs.length; i++ )
                                                 removeIds( childs[ i ] );
-                                };
+                                }
+                        };
 
-                                // The "id" attribute should never be cloned to avoid duplication.
-                                removeIds( $clone );
-                        }
+                        // The "id" attribute should never be cloned to avoid duplication.
+                        removeIds( $clone );
 
                         return new CKEDITOR.dom.node( $clone );
                 },

_source/core/dom/domobject.js

@@ -167 +167 @@
         /**
          * Sets a data slot value for this object. These values are shared by all
          * instances pointing to that same DOM object.
+         * <strong>Note:</strong> The created data slot is only guarantied to be available on this unique dom node,
+         * thus any wish to continue access it from other element clones (either created by clone node or from innerHtml)
+         * will fail, for such usage, please use {@link CKEDITOR.dom.element::setAttribute} instead.
          * @name CKEDITOR.dom.domObject.prototype.setCustomData
          * @function
          * @param {String} key A key used to identify the data slot.