Changeset 5159

Timestamp:

02/20/10 17:28:56 (3 years ago)

Author:

fredck

Message:

#5197 : In IE we were having js errors on page reload.

Location:

CKEditor/branches/versions/3.2.x/_source

Files:

• core/tools.js (modified) (1 diff)
• plugins/wysiwygarea/plugin.js (modified) (2 diffs)

CKEditor/branches/versions/3.2.x/_source/core/tools.js

@@ -620 +620 @@
 
                 /**
+                 * Removes the function reference created with {@see CKEDITOR.tools.addFunction}.
+                 * @param {Number} ref The function reference created with
+                 *              CKEDITOR.tools.addFunction.
+                 */
+                removeFunction : function( ref )
+                {
+                        functions[ ref ] = null;
+                },
+
+                /**
                  * Executes a function based on the reference created with
                  * CKEDITOR.tools.addFunction.

CKEditor/branches/versions/3.2.x/_source/plugins/wysiwygarea/plugin.js

@@ -264 +264 @@
 
                                                 frameLoaded = 0;
+                                                
+                                                var setDataFn = !CKEDITOR.env.gecko && CKEDITOR.tools.addFunction( function( doc )
+                                                        {
+                                                                CKEDITOR.tools.removeFunction( setDataFn );
+                                                                doc.write( data );
+                                                        });
+
+                                                var srcScript =
+                                                        'document.open();' +
+
+                                                        // The document domain must be set any time we
+                                                        // call document.open().
+                                                        ( isCustomDomain ? ( 'document.domain="' + document.domain + '";' ) : '' ) +
+
+                                                        // With FF, it's better to load the data on
+                                                        // iframe.load. (#3894,#4058)
+                                                        // But in FF, we still need the open()-close() call
+                                                        // to avoid HTTPS warnings.
+                                                        ( CKEDITOR.env.gecko ? '' : ( 'parent.CKEDITOR.tools.callFunction(' + setDataFn + ',document);' ) ) +
+
+                                                        'document.close();';
 
                                                 iframe = CKEDITOR.dom.element.createFromHtml( '<iframe' +
                                                         ' style="width:100%;height:100%"' +
                                                         ' frameBorder="0"' +
-                                                        ( !CKEDITOR.env.webkit ?
-                                                                // Support for custom document.domain in IE.
-                                                                ' src="javascript:void((function(){' +
-                                                                'document.open();' +            // To avoid HTTPS warnings.
-                                                                ( isCustomDomain ?
-                                                                        'document.domain=\'' + document.domain + '\';' : '' ) +
-                                                                'document.close();' +
-                                                                '})())"' : '' ) +
+                                                        ' src="javascript:void(function(){' + encodeURIComponent( srcScript ) + '}())"' +
                                                         ' tabIndex="' + editor.tabIndex + '"' +
                                                         ' allowTransparency="true"' +
                                                         '></iframe>' );
 
-                                                // Register onLoad event for iframe element, which
-                                                // will fill it with content and set custom domain.
-                                                iframe.on( 'load', function( e )
-                                                        {
-                                                                e.removeListener();
+                                                // With FF, it's better to load the data on iframe.load. (#3894,#4058)
+                                                CKEDITOR.env.gecko && iframe.on( 'load', function( ev )
+                                                        {
+                                                                ev.removeListener();
+
                                                                 var doc = iframe.getFrameDocument().$;
 
-                                                                // Custom domain handling is needed after each document.open().
                                                                 doc.open();
-                                                                if ( isCustomDomain )
-                                                                        doc.domain = document.domain;
                                                                 doc.write( data );
                                                                 doc.close();
-
                                                         });
 
@@ -311 +321 @@
                                         var activationScript =
                                                 '<script id="cke_actscrpt" type="text/javascript" cke_temp="1">' +
-                                                        'window.parent.CKEDITOR._["contentDomReady' + editor.name + '"]( window );' +
+                                                        ( isCustomDomain ? ( 'document.domain="' + document.domain + '";' ) : '' ) +
+                                                        'parent.CKEDITOR._["contentDomReady' + editor.name + '"]( window );' +
                                                 '</script>';