Changeset 2361 for FCKeditor/trunk

Timestamp:

2008-08-18 04:42:45 (5 months ago)

Author:

martinkou

Message:

Fixed #2467: Fixed JavaScript error with the fit window command in source mode.

Location:

FCKeditor/trunk

Files:

• editor/_source/commandclasses/fckfitwindow.js (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

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

@@ -39 +39 @@
 
         // Save the current selection and scroll position.
-        var oRange = new FCKDomRange( FCK.EditorWindow ) ;
-        oRange.MoveToSelection() ;
-        var oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ;
+        var oRange, oEditorScrollPos ;
+        if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+        {
+                oRange = new FCKDomRange( FCK.EditorWindow ) ;
+                oRange.MoveToSelection() ;
+                oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ;
+        }
+        else
+        {
+                var eTextarea = FCK.EditingArea.Textarea ;
+                oRange = !FCKBrowserInfo.IsIE && [ eTextarea.selectionStart, eTextarea.selectionEnd ] ;
+                oEditorScrollPos = [ eTextarea.scrollLeft, eTextarea.scrollTop ] ;
+        }
 
         // No original style properties known? Go fullscreen.
@@ -168 +178 @@
 
         // Restore the selection and scroll position of inside the document.
-        oRange.Select() ;
-        FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ;
+        if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
+        {
+                oRange.Select() ;
+                FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ;
+        }
+        else
+        {
+                if ( !FCKBrowserInfo.IsIE )
+                {
+                        eTextarea.selectionStart = oRange[0] ;
+                        eTextarea.selectionEnd = oRange[1] ;
+                }
+                eTextarea.scrollLeft = oEditorScrollPos[0] ;
+                eTextarea.scrollTop = oEditorScrollPos[1] ;
+        }
 }
 

FCKeditor/trunk/_whatsnew.html

@@ -45 +45 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2333">#2333</a>] The &amp;gt;
                         character inside text wasn't encoded in Opera and Safari.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2467">#2467</a>] Fixed JavaScript
+                        error with the fit window command in source mode.</li>
         </ul>
         <p>