Ticket #2519: 2519.patch

_whatsnew.html

@@ -62 +62 @@
                         now are shown properly.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2496">#2496</a>] Using the Paste
                         dialogs in IE might insert the content at the start of the editor.</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>
                 <a href="_whatsnew_history.html">See previous versions history</a></p>

editor/_source/fckeditorapi.js

@@ -42 +42 @@
                         'window.FCKeditorAPI = {' +
                                 'Version : "[Development]",' +
                                 'VersionBuild : "[DEV]",' +
-                                'Instances : new Object(),' +
+                                'Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},' +
 
                                 'GetInstance : function( name )' +
                                 '{' +
@@ -60 +60 @@
                                         'this._FCKOriginalSubmit() ;' +
                                 '},' +
 
-                                '_FunctionQueue : {' +
+                                '_FunctionQueue : window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {' +
                                         'Functions : new Array(),' +
                                         'IsRunning : false,' +
 
@@ -117 +117 @@
                         }
                         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') ;
                                 eScript.appendChild( oParentDocument.createTextNode( sScript ) ) ;