Changeset 2562

Timestamp:

10/13/08 19:13:25 (5 years ago)

Author:

martinkou

Message:

Fixed #2519 : Fixed race condition at registering the FCKeditorAPI object in multiple editor scenarios.

Location:

FCKeditor/trunk

Files:

• _whatsnew.html (modified) (1 diff)
• editor/_source/fckeditorapi.js (modified) (3 diffs)

FCKeditor/trunk/_whatsnew.html

@@ -74 +74 @@
                         where email links in IE would take the browser to a new page in addition to calling up the
                         email client.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2519">#2519</a>] Fixed race
+                        condition at registering the FCKeditorAPI object in multiple editor scenarios.</li>
         </ul>
         <p>

FCKeditor/trunk/editor/_source/fckeditorapi.js

@@ -43 +43 @@
                                 'Version : "[Development]",' +
                                 'VersionBuild : "[DEV]",' +
-                                'Instances : new Object(),' +
+                                'Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},' +
 
                                 'GetInstance : function( name )' +
@@ -61 +61 @@
                                 '},' +
 
-                                '_FunctionQueue : {' +
+                                '_FunctionQueue : window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {' +
                                         'Functions : new Array(),' +
                                         'IsRunning : false,' +
@@ -118 +118 @@
                         else if ( FCKBrowserInfo.IsSafari )
                         {
-                                // oParentWindow.eval in Safari and Gran Paradiso executes in the calling window
-                                // environment, instead of the parent one. The following should make it work.
+                                // oParentWindow.eval in Safari executes in the calling window
+                                // environment, instead of the parent one. The following should
+                                // make it work.
                                 var oParentDocument = oParentWindow.document ;
                                 var eScript = oParentDocument.createElement('script') ;