Changeset 1284

Timestamp:

2008-01-11 11:28:22 (2 years ago)

Author:

fredck

Message:

Fixed #1522 : The ENTER key will not work properly for collapsed selections at the start of formatted paragraphs.

Location:

FCKeditor/trunk

Files:

• editor/_source/classes/fckdomrange_ie.js (modified) (2 diffs)
• editor/_source/classes/fckenterkey.js (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/classes/fckdomrange_ie.js

@@ -114 +114 @@
                 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).
@@ -144 +144 @@
                 if ( bIsStartMakerAlone )
                 {
-                        // Move the selection start to include the temporary &nbsp;.
+                        // Move the selection start to include the temporary &#65279;.
                         oIERange.moveStart( 'character', -1 ) ;
                         

FCKeditor/trunk/editor/_source/classes/fckenterkey.js

@@ -415 +415 @@
                 // boundaries were on separated blocks, or none of them where on the
                 // block limits (start/end).
-                if ( !oSplitInfo.WasStartOfBlock && !oSplitInfo.WasEndOfBlock )
+                if ( !bIsStartOfBlock && !bIsEndOfBlock )
                 {
                         // If the next block is an <li> with another list tree as the first child
@@ -488 +488 @@
                         {
                                 // Move the selection to the new block.
-                                oRange.MoveToNodeContents( eNewBlock ) ;
+                                oRange.MoveToElementEditStart( eNewBlock ) ;
                                 oRange.Select() ;
                         }

FCKeditor/trunk/_whatsnew.html

@@ -46 +46 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1643">#1643</a>] Resolved
                         several "strict warning" messages in Firefox when running FCKeditor.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1522">#1522</a>] The ENTER
+                        key will now work properly in IE with the cursor at the start of a formatted block.</li>
         </ul>
         <p>