Ticket #4143: 4143.patch

_source/tests/plugins/domiterator/domiterator.html

@@ -131 +131 @@
                         var range = new CKEDITOR.dom.range( doc );
                         range.setStartAt( doc.getById( 'iterTarget4a' ), CKEDITOR.POSITION_AFTER_START );
                         range.setEndAt( doc.getById( 'iterTarget4b' ), CKEDITOR.POSITION_BEFORE_END );
-                        assumeIterationSameAs( range, null, [ 'p', 'div' ] );
+                        assumeIterationSameAs( range, null, [ 'p', 'p' ] );
                         assumeElementContentAreSame( 'iterContainer4', 'iterResult4' );
                 },
 
@@ -219 +219 @@
 <div id="iterContainer4">
         <div id="iterTarget4b"><p id="iterTarget4a">paragraph</p>text</div>
 </div>
-<textarea id="iterResult4"><div id="iterTarget4b"><p id="iterTarget4a">paragraph</p>text</div></textarea>
+<textarea id="iterResult4"><div id="iterTarget4b"><p id="iterTarget4a">paragraph</p><p>text</p></div></textarea>
 
 <div id="iterContainer7"><p id="iterTarget7">paragraph</p></div>
 <textarea id="iterResult7"><p id="iterTarget7">paragraph</p></textarea>

_source/core/dom/range.js

@@ -129 +129 @@
 
                         // For Extract and Clone, we must clone this level.
                         if ( clone && !levelStartNode.equals( startNode ) )             // action = 0 = Delete
-                                levelClone = clone.append( levelStartNode.clone() );
+                                levelClone = clone.append( levelStartNode.clone( false, action == 1 ) );
 
                         currentNode = levelStartNode.getNext();
 
@@ -173 +173 @@
 
                         // For Extract and Clone, we must clone this level.
                         if ( action > 0 && !levelStartNode.equals( endNode ) )          // action = 0 = Delete
-                                levelClone = clone.append( levelStartNode.clone() );
+                                levelClone = clone.append( levelStartNode.clone( false, action == 1 ) );
 
                         // The processing of siblings may have already been done by the parent.
                         if ( !startParents[ k ] || levelStartNode.$.parentNode != startParents[ k ].$.parentNode )

CHANGES.html

@@ -210 +210 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4123">#4123</a> : Some dialog buttons were broken in IE7 quirks.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4122">#4122</a> : [IE] The image dialog 
                         was being rendered improperly when loading an image with long URL.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4143">#4143</a> : Element id is lost
+                        when extracting contents from the range.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>