Index: _whatsnew.html
===================================================================
--- _whatsnew.html (revision 2529)
+++ _whatsnew.html (working copy)
@@ -62,6 +62,8 @@
now are shown properly.
[#2496] Using the Paste
dialogs in IE might insert the content at the start of the editor.
+ [#2519] Fixed race
+ condition at registering the FCKeditorAPI object in multiple editor scenarios.
See previous versions history
Index: editor/_source/fckeditorapi.js
===================================================================
--- editor/_source/fckeditorapi.js (revision 2529)
+++ editor/_source/fckeditorapi.js (working copy)
@@ -42,7 +42,7 @@
'window.FCKeditorAPI = {' +
'Version : "[Development]",' +
'VersionBuild : "[DEV]",' +
- 'Instances : new Object(),' +
+ 'Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},' +
'GetInstance : function( name )' +
'{' +
@@ -60,7 +60,7 @@
'this._FCKOriginalSubmit() ;' +
'},' +
- '_FunctionQueue : {' +
+ '_FunctionQueue : window.FCKeditorAPI && window.FCKeditorAPI._FunctionQueue || {' +
'Functions : new Array(),' +
'IsRunning : false,' +
@@ -117,8 +117,9 @@
}
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 ) ) ;