Ticket #2113: 2113_2.patch

_whatsnew.html

@@ -49 +49 @@
                         fckstyles.xml in servers which cannot return the correct content type header for .xml files.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2102">#2102</a>] Fixed FCKConfig.DocType
                         which stopped working in FCKeditor 2.6.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2113">#2113</a>] Fixed unneeded &lt;span
+                        class=&quot;Apple-style-span&quot;&gt; created after inserting special characters.</li>
         </ul>
         <h3>
                 Version 2.6</h3>

editor/_source/internals/fck_gecko.js

@@ -361 +361 @@
         this.EditorDocument.execCommand( 'inserthtml', false, html ) ;
         this.Focus() ;
 
+        // Save the caret position before calling document processor.
+        var range = new FCKDomRange( this.EditorWindow ) ;
+        range.MoveToSelection() ;
+        var bookmark = range.CreateBookmark() ;
+
         FCKDocumentProcessor.Process( FCK.EditorDocument ) ;
 
+        // Restore caret position, ignore any errors in case the document
+        // processor removed the bookmark <span>s for some reason.
+        try
+        {
+                range.MoveToBookmark( bookmark ) ;
+                range.Select() ;
+        }
+        catch ( e ) {}
+
         // For some strange reason the SaveUndoStep() call doesn't activate the undo button at the first InsertHtml() call.
         this.Events.FireEvent( "OnSelectionChange" ) ;
 }

editor/_source/internals/fckdocumentprocessor.js

@@ -247 +247 @@
                 fakeImg.className = 'FCK__Flash' ;
                 fakeImg.setAttribute( '_fckflash', 'true', 0 );
         } ) ;
+
+// Buggy <span class="Apple-style-span"> tags added by Safari.
+if ( FCKBrowserInfo.IsSafari )
+{
+        FCKDocumentProcessor.AppendNew().ProcessDocument = function( doc )
+        {
+                var spans = doc.getElementsByTagName( 'span' ) ;
+                for ( var i = 0 ; i < spans.length ; i++ )
+                        ( spans[i].className == 'Apple-style-span' ) && ( FCKDomTools.RemoveNode( spans[i], true ) ) ;
+        }
+}