Changeset 1951

Timestamp:

2008-05-05 04:58:00 (23 months ago)

Author:

martinkou

Message:

Fixed #2113 : Fixed unneeded <span class="Apple-style-span"> created after inserting special characters.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fckdocumentprocessor.js (modified) (1 diff)
• editor/_source/internals/fck_gecko.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/internals/fckdocumentprocessor.js

@@ -248 +248 @@
                 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.getElementsByClassName ?
+                        doc.getElementsByClassName( 'Apple-style-span' ) :
+                        Array.prototype.filter.call( 
+                                        doc.getElementsByTagName( 'span' ), 
+                                        function( item ){ return item.className == 'Apple-style-span' ; } 
+                                        ) ;
+                for ( var i = spans.length - 1 ; i >= 0 ; i-- )
+                        FCKDomTools.RemoveNode( spans[i], true ) ;
+        }
+}

FCKeditor/trunk/editor/_source/internals/fck_gecko.js

@@ -362 +362 @@
         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.

FCKeditor/trunk/_whatsnew.html

@@ -65 +65 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1633">#1633</a>] External styles should no
                         longer interfere with the appearance of the editor and floating panels now.</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>