Ticket #1522: 1522.patch

editor/_source/classes/fckdomrange_ie.js

@@ -109 +109 @@
                 oIERange.setEndPoint( 'EndToEnd', oIERangeEnd ) ;
                 oIERange.moveEnd( 'character', -1 ) ;
         }
-        else
+        
+        if ( oIERange.text.length == 0 && oIERange.boundingWidth == 0 )
         {
                 bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
                 
-                // Append a temporary <span>&nbsp;</span> before the selection.
+                // Append a temporary <span>&#65279;</span> before the selection.
                 // This is needed to avoid IE destroying selections inside empty
                 // inline elements, like <b></b> (#253).
                 // It is also needed when placing the selection right after an inline
@@ -139 +140 @@
         this._Range.setStartBefore( eStartMarker ) ;
         eStartMarker.parentNode.removeChild( eStartMarker ) ;
 
-        if ( bIsCollapsed )
+        if ( eEndMarker )
         {
+                this._Range.setEndBefore( eEndMarker ) ;
+                eEndMarker.parentNode.removeChild( eEndMarker ) ;
+                oIERange.select() ;
+        }
+
+        if ( dummySpan )
+        {
                 if ( bIsStartMakerAlone )
                 {
-                        // Move the selection start to include the temporary &nbsp;.
+                        // Move the selection start to include the temporary &#65279;.
                         oIERange.moveStart( 'character', -1 ) ;
                         
                         oIERange.select() ;
@@ -156 +164 @@
 
                 FCKDomTools.RemoveNode( dummySpan ) ;
         }
-        else
-        {
-                this._Range.setEndBefore( eEndMarker ) ;
-                eEndMarker.parentNode.removeChild( eEndMarker ) ;
-                oIERange.select() ;
-        }
 }
 
 FCKDomRange.prototype._GetSelectionMarkerTag = function( toStart )