Changeset 805

Timestamp:

09/13/07 05:15:05 (6 years ago)

Author:

martinkou

Message:

Fixed the issue where justfiy commands do not work for bare text nodes under document.body.
Fixed the issue where FCKDomRange.Expand() and FCKDomRange.FixBlock() does not work when the range is in a bare text node under document.body.

Location:

FCKeditor/trunk/editor/_source

Files:

• commandclasses/fckjustifycommands.js (modified) (2 diffs)
• internals/fcklistslib.js (modified) (1 diff)

FCKeditor/trunk/editor/_source/commandclasses/fckjustifycommands.js

@@ -34 +34 @@
                 var range = new FCKDomRange( FCK.EditorWindow ) ;
                 range.MoveToSelection() ;
+                var bookmark = range.CreateBookmark() ;
                 range.Expand( 'block_contents' ) ;
                 if ( range.StartContainer == range.Window.document.body )
@@ -44 +45 @@
                         range.StartContainer.style.textAlign = '' ;
 
+                range.MoveToBookmark( bookmark ) ;
+                range.Select() ;
                 FCK.Events.FireEvent( 'OnSelectionChange' ) ;
         },

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

@@ -56 +56 @@
         
         // Elements used to separate block contents.
-        BlockBoundaries : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1 },
-        ListBoundaries : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,br:1 },
+        BlockBoundaries : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,body:1 },
+        ListBoundaries : { p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,address:1,pre:1,ol:1,ul:1,li:1,dt:1,de:1,table:1,thead:1,tbody:1,tfoot:1,tr:1,th:1,td:1,caption:1,col:1,colgroup:1,blockquote:1,br:1,body:1 },
 
         // Final setup of FCKListsLib once the editor is loaded (at FCK.StartEditor).