Ticket #2411: 2411_2.patch

_whatsnew.html

@@ -45 +45 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2407">#2407</a>] Fixed the issue 
                         where FCK.InsertHtml() is no longer removing selected contents after content insertion
                         in Firefox.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2411">#2411</a>] Fixed the issue
+                        where insert anchor no longer works for non-empty selections.</li>
         </ul>
         <h3>
                 Version 2.6.3 Beta</h3>

editor/dialog/fck_anchor.html

@@ -119 +119 @@
         var aNewAnchors = oEditor.FCK.CreateLink( '#' ) ;
 
         if ( aNewAnchors.length == 0 )
-        {
-                // Nothing was selected, so now just create a normal A
-                if ( FCKBrowserInfo.IsIE )
-                        aNewAnchors.push( oEditor.FCK.InsertElement( '<a name="' + FCKTools.HTMLEncode( sNewName ).replace( '"', '&quot;' ) + '">' ) ) ;
-                else
-                {
-                        var n = oEditor.FCK.InsertElement( 'a' ) ;
-                        n.name = sNewName ;
-                        aNewAnchors.push( n ) ;
-                }
-        }
+                        aNewAnchors.push( oEditor.FCK.InsertElement( 'a' ) ) ;
         else
         {
                 // Remove the fake href
@@ -142 +132 @@
         {
                 oAnchor = aNewAnchors[i] ;
 
+                // Set the name
+                if ( FCKBrowserInfo.IsIE )
+                {
+                        // Setting anchor names directly in IE will trash the HTML code stored
+                        // in FCKTempBin after undos. See #2263.
+                        var replaceAnchor = oEditor.FCK.EditorDocument.createElement( '<a name="' +
+                                        FCKTools.HTMLEncode( sNewName ).replace( '"', '&quot;' ) + '">' ) ;
+                        oEditor.FCKDomTools.MoveChildren( oAnchor, replaceAnchor ) ;
+                        oAnchor.parentNode.replaceChild( replaceAnchor, oAnchor ) ;
+                        oAnchor = replaceAnchor ;
+                }
+                else
+                        oAnchor.name = sNewName ;
+
                 // IE does require special processing to show the Anchor's image
                 // Opera doesn't allow to select empty anchors
                 if ( FCKBrowserInfo.IsIE || FCKBrowserInfo.IsOpera )