Changeset 4635

Timestamp:

12/09/09 16:12:01 (3 years ago)

Author:

garry.yao

Message:

Fixing #4733: dialog gives up trying to give focus while all focusable are checked.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/dialog/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -91 +91 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4690">#4690</a> : Fixed the parsing of nested inline elements.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4450">#4450</a> : Fixed selecting multiple table cells before apply justify commands generates spurious paragraph in Firefox.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4733">#4733</a> : Fixed dialog opening sometimes hang up Firefox and Safari.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/dialog/plugin.js

@@ -260 +260 @@
                                 return;
 
-                        var currentIndex = ( me._.currentFocusIndex + offset + focusList.length ) % focusList.length;
+                        var startIndex = ( me._.currentFocusIndex + offset + focusList.length ) % focusList.length,
+                                currentIndex = startIndex;
                         while ( !focusList[ currentIndex ].isFocusable() )
                         {
                                 currentIndex = ( currentIndex + offset + focusList.length ) % focusList.length;
-                                if ( currentIndex == me._.currentFocusIndex )
+                                if ( currentIndex == startIndex )
                                         break;
                         }