Ticket #3812: 3812_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -210 +210 @@
                         editor.on( 'editingBlockReady', function()
                                 {
                                         var mainElement,
+                                                fieldset,
                                                 iframe,
                                                 isLoadingData,
                                                 isPendingFocus,
@@ -223 +224 @@
                                         {
                                                 if ( iframe )
                                                         iframe.remove();
+                                                if ( fieldset )
+                                                        fieldset.remove();
 
                                                 iframe = new CKEDITOR.dom.element( 'iframe' )
                                                         .setAttributes({
@@ -233 +236 @@
                                                                 width : '100%',
                                                                 height : '100%' });
 
-                                                if ( CKEDITOR.env.ie )
-                                                {
-                                                        if ( isCustomDomain )
-                                                        {
-                                                                // The document domain must be set within the src
-                                                                // attribute.
-                                                                iframe.setAttribute( 'src',
-                                                                        'javascript:void( (function(){' +
-                                                                                'document.open();' +
-                                                                                'document.domain="' + document.domain + '";' +
-                                                                                'document.write( window.parent._cke_htmlToLoad_' + editor.name + ' );' +
-                                                                                'document.close();' +
-                                                                                'window.parent._cke_htmlToLoad_' + editor.name + ' = null;' +
-                                                                        '})() )' );
-                                                        }
-                                                        else
-                                                                // To avoid HTTPS warnings.
-                                                                iframe.setAttribute( 'src', 'javascript:void(0)' );
-                                                }
+                                                // The document domain must be set within the src
+                                                // attribute.
+                                                iframe.setAttribute( 'src',
+                                                        'javascript:void( (function(){' +
+                                                                'document.open();' +
+                                                                ( CKEDITOR.env.ie && isCustomDomain ? 'document.domain="' + document.domain + '";' : '' ) +
+                                                                'document.write( window.parent._cke_htmlToLoad_' + editor.name + ' );' +
+                                                                'document.close();' +
+                                                                'window.parent._cke_htmlToLoad_' + editor.name + ' = null;' +
+                                                        '})() )' );
 
                                                 var accTitle = editor.lang.editorTitle.replace( '%1', editor.name );
 
@@ -277 +271 @@
                                                 else if ( CKEDITOR.env.ie )
                                                 {
                                                         // Accessibility label for IE.
-                                                        var fieldset = CKEDITOR.dom.element.createFromHtml(
+                                                        fieldset = CKEDITOR.dom.element.createFromHtml(
                                                                 '<fieldset style="height:100%' +
                                                                         ( CKEDITOR.env.quirks ? ';position:relative' : '' ) +
                                                                 '">' +
@@ -444 +438 @@
                                                                 if ( CKEDITOR.env.ie && ( CKEDITOR.env.quirks || CKEDITOR.env.version < 8 ) )
                                                                         holderElement.setStyle( 'position', 'relative' );
 
-                                                                // Create the iframe at load for all browsers
-                                                                // except FF and IE with custom domain.
-                                                                if ( !isCustomDomain || !CKEDITOR.env.gecko )
-                                                                        createIFrame();
-
                                                                 // The editor data "may be dirty" after this
                                                                 // point.
                                                                 editor.mayBeDirty = true;
@@ -486 +475 @@
                                                                         '</html>' +
                                                                         activationScript;
 
-                                                                // For custom domain in IE, set the global variable
-                                                                // that will temporarily hold the editor data. This
-                                                                // reference will be used in the ifram src.
-                                                                if ( isCustomDomain )
-                                                                        window[ '_cke_htmlToLoad_' + editor.name ] = data;
-
+                                                                window[ '_cke_htmlToLoad_' + editor.name ] = data;
                                                                 CKEDITOR._[ 'contentDomReady' + editor.name ] = contentDomReady;
-
-                                                                // We need to recreate the iframe in FF for every
-                                                                // data load, otherwise the following spellcheck
-                                                                // and execCommand features will be active only for
-                                                                // the first time.
-                                                                // The same is valid for IE with custom domain,
-                                                                // because the iframe src must be reset every time.
-                                                                if ( isCustomDomain || CKEDITOR.env.gecko )
-                                                                        createIFrame();
-
-                                                                // For custom domain in IE, the data loading is
-                                                                // done through the src attribute of the iframe.
-                                                                if ( !isCustomDomain )
-                                                                {
-                                                                        var doc = iframe.$.contentWindow.document;
-                                                                        doc.open();
-                                                                        doc.write( data );
-                                                                        doc.close();
-                                                                }
+                                                                createIFrame();
                                                         },
 
                                                         getData : function()

CHANGES.html

@@ -55 +55 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3820">#3820</a> : Fixed an issue in
                         bullet list command in which a list created at the bottom of another gets merged to the top.
                         </li>
+                <li><a href="http://dev.fckeditor.net/ticket/3812">#3812</a> : Fixed an issue in which the editor
+                        may show up empty or uneditable in IE7, 8 and Firefox 3.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>