Ticket #2322: 2322.patch

_whatsnew.html

@@ -54 +54 @@
                         has pressed the Source button.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2314">#2314</a>] Corrected
                         mixed up Chinese translations for the blockquote command.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2322">#2322</a>] Fixed the issue
+                        where the fit window command loses the current selection and scroll position in the
+                        editing area.</li>
         </ul>
         <p>
                 <a href="_whatsnew_history.html">See previous versions history</a></p>

editor/_source/commandclasses/fckfitwindow.js

@@ -37 +37 @@
         var eBodyStyle                  = eBody.style ;
         var eParent ;
 
+        // Save the current selection and scroll position.
+        var oRange = new FCKDomRange( FCK.EditorWindow ) ;
+        oRange.MoveToSelection() ;
+        var oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ;
+
         // No original style properties known? Go fullscreen.
         if ( !this.IsMaximized )
         {
@@ -160 +165 @@
                 FCK.EditingArea.MakeEditable() ;
 
         FCK.Focus() ;
+
+        // Restore the selection and scroll position of inside the document.
+        oRange.Select() ;
+        FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ;
 }
 
 FCKFitWindow.prototype.GetState = function()