Changeset 1053

Timestamp:

2007-10-30 15:07:06 (2 years ago)

Author:

fredck

Message:

Fixed #1431 : The selection was not correctly positioned inside <pre> when pressing enter.

Location:

FCKeditor/trunk/editor/_source/classes

Files:

• fckdomrange_ie.js (modified) (2 diffs)
• fckenterkey.js (modified) (3 diffs)

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

@@ -67 +67 @@
 }
 
-FCKDomRange.prototype.Select = function()
+FCKDomRange.prototype.Select = function( forceExpand )
 {
         if ( this._Range )
-                this.SelectBookmark( this.CreateBookmark( true ) ) ;
+                this.SelectBookmark( this.CreateBookmark( true ), forceExpand ) ;
 }
 
 // Not compatible with bookmark created with CreateBookmark2.
 // The bookmark nodes will be deleted from the document.
-FCKDomRange.prototype.SelectBookmark = function( bookmark )
+FCKDomRange.prototype.SelectBookmark = function( bookmark, forceExpand )
 {
         var bIsCollapsed = this.CheckIsCollapsed() ;
@@ -112 +112 @@
         else
         {
-                bIsStartMakerAlone = ( !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
+                bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
                 
                 // Append a temporary <span>&nbsp;</span> before the selection.

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

@@ -519 +519 @@
 
                 var bHasShift = this._HasShift ;
+                var bIsPre = false ;
 
                 if ( !bHasShift && sStartBlockTag == 'LI' )
@@ -538 +539 @@
                 else
                 {
-                        var eLineBreak = null ;
-                        if ( sStartBlockTag.IEquals( 'pre' ) )
+                        var eLineBreak ;
+                        bIsPre = sStartBlockTag.IEquals( 'pre' ) ;
+                        if ( bIsPre )
                                 eLineBreak = this.Window.document.createTextNode( FCKBrowserInfo.IsIE ? '\r' : '\n' ) ;
                         else
@@ -575 +577 @@
                 oRange.Collapse( true ) ;
 
-                oRange.Select() ;
+                oRange.Select( bIsPre ) ;
         }