Changeset 1775

Timestamp:

2008-03-22 17:40:44 (6 months ago)

Author:

fredck

Message:

Fixed #1792 : In IE, the browser was able to enter in an infinite loop when working with multiple editors in the same page.

Location:

FCKeditor/trunk

Files:

• editor/_source/classes/fckeditingarea.js (modified) (2 diffs)
• editor/_source/internals/fck.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

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

@@ -301 +301 @@
                 if ( this.Mode == FCK_EDITMODE_WYSIWYG )
                 {
-                        // The following check is important to avoid IE entering in a focus loop. Ref:
-                        // http://sourceforge.net/tracker/index.php?func=detail&aid=1567060&group_id=75348&atid=543653
-                        if ( FCKBrowserInfo.IsIE && this.Document.hasFocus() )
-                                this._EnsureFocusIE() ;
-
-                        this.Window.focus() ;
-
-                        // In IE it can happen that the document is in theory focused but the active element is outside it
                         if ( FCKBrowserInfo.IsIE )
-                                this._EnsureFocusIE() ;
+                                this._FocusIE() ;
+                        else
+                                this.Window.focus() ;
                 }
                 else
@@ -324 +318 @@
 }
 
-FCKEditingArea.prototype._EnsureFocusIE = function()
-{
-        // In IE it can happen that the document is in theory focused but the active element is outside it
+FCKEditingArea.prototype._FocusIE = function()
+{
+        // In IE it can happen that the document is in theory focused but the
+        // active element is outside of it.
         this.Document.body.setActive() ;
+
+        this.Window.focus() ;
 
         // Kludge for #141... yet more code to workaround IE bugs

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

@@ -1146 +1146 @@
 function FCKFocusManager_Win_OnFocus_Area()
 {
+        // Check if we are already focusing the editor (to avoid loops).
+        if ( FCKFocusManager._IsFocusing )
+                return ;
+
+        FCKFocusManager._IsFocusing = true ;
+
         FCK.Focus() ;
         FCKFocusManager_Win_OnFocus() ;
+
+        // The above FCK.Focus() call may trigger other focus related functions.
+        // So, to avoid a loop, we delay the focusing mark removal, so it get
+        // executed after all othre functions have been run.
+        FCKTools.RunFunction( function()
+                {
+                        delete FCKFocusManager._IsFocusing ;
+                } ) ;
 }
 

FCKeditor/trunk/_whatsnew.html

@@ -113 +113 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1998">#1998</a>] The native
                         XMLHttpRequest class is now used in IE, whenever it is available.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1792">#1792</a>] In IE,
+                        the browser was able to enter in an infinite loop when working with multiple editors
+                        in the same page. </li>
         </ul>
         <h3>