Ticket #4058: 4058.patch

_source/plugins/wysiwygarea/plugin.js

@@ -216 +216 @@
                                                 iframe,
                                                 isLoadingData,
                                                 isPendingFocus,
+                                                blockReady = false,
                                                 fireMode;
 
                                         // Support for custom document.domain in IE.
@@ -262 +263 @@
 
                                                 if ( CKEDITOR.env.gecko )
                                                 {
+                                                        // Make sure it will be loaded properly ( #4058 ).
+                                                        var onIframeLoad = function( data )
+                                                        {
+                                                                iframe.removeListener( 'load', onIframeLoad ); 
+                                                                if ( !blockReady )
+                                                                        contentDomReady( data.sender.$.contentWindow );
+                                                        };
+                                                        iframe.on( 'load', onIframeLoad );
+
                                                         // Accessibility attributes for Firefox.
                                                         mainElement.setAttributes(
                                                                 {
@@ -305 +315 @@
                                                 '<script id="cke_actscrpt" type="text/javascript">' +
                                                         'window.onload = function()' +
                                                         '{' +
-                                                                // Remove this script from the DOM.
-                                                                'var s = document.getElementById( "cke_actscrpt" );' +
-                                                                's.parentNode.removeChild( s );' +
-
                                                                 // Call the temporary function for the editing
                                                                 // boostrap.
                                                                 'window.parent.CKEDITOR._["contentDomReady' + editor.name + '"]( window );' +
@@ -318 +324 @@
                                         // Editing area bootstrap code.
                                         var contentDomReady = function( domWindow )
                                         {
-                                                delete CKEDITOR._[ 'contentDomReady' + editor.name ];
+                                                blockReady = true;
 
                                                 var domDocument = domWindow.document,
                                                         body = domDocument.body;
 
+                                                // Remove this script from the DOM.
+                                                var script = domDocument.getElementById( "cke_actscrpt" );
+                                                script.parentNode.removeChild( script );
+
+                                                delete CKEDITOR._[ 'contentDomReady' + editor.name ];
+
                                                 body.spellcheck = !editor.config.disableNativeSpellChecker;
 
                                                 if ( CKEDITOR.env.ie )