Ticket #4058: 4058_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -216 +216 @@
                                                 iframe,
                                                 isLoadingData,
                                                 isPendingFocus,
+                                                frameLoaded,
                                                 fireMode;
 
                                         // Support for custom document.domain in IE.
@@ -229 +230 @@
                                                 if ( fieldset )
                                                         fieldset.remove();
 
+                                                frameLoaded = 0;
                                                 // The document domain must be set within the src
                                                 // attribute;
                                                 // Defer the script execution until iframe
@@ -262 +264 @@
 
                                                 if ( CKEDITOR.env.gecko )
                                                 {
+                                                        // Double checking the iframe will be loaded properly(#4058).
+                                                        iframe.on( 'load', function( ev )
+                                                        {
+                                                                ev.removeListener();
+                                                                contentDomReady( iframe.$.contentWindow );
+                                                        } );
+
                                                         // Accessibility attributes for Firefox.
                                                         mainElement.setAttributes(
                                                                 {
@@ -307 +316 @@
                                                 '<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 );' +
@@ -320 +325 @@
                                         // Editing area bootstrap code.
                                         var contentDomReady = function( domWindow )
                                         {
-                                                delete CKEDITOR._[ 'contentDomReady' + editor.name ];
+                                                if ( frameLoaded )
+                                                        return;
+                                                else
+                                                        frameLoaded = 1;
 
                                                 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 )

CHANGES.html

@@ -197 +197 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3622">#3622</a> : The toolbar in the v2 
                         skin was wrapping improperly in some languages.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4119">#4119</a> : Unable to edit image link with image dialog.</li> 
+                <li><a href="http://dev.fckeditor.net/ticket/4058">#4058</a> : [FF3.5] wysiwyg mode is sometimes not been activated.</li> 
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>