Changeset 51082

Timestamp:

06/07/2021 11:06:48 PM (4 years ago)

Author:

azaozz

Message:

TinyMCE: Fix initialization when the editor is in a postbox by delaying it until document.readyState === 'complete'.

Props metalandcoffee, desrosj, patkemper, herrvigg, spikeuk1, dway, mkdgs, azaozz.
Fixes #52133, #52050.

File:

• trunk/src/wp-includes/class-wp-editor.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-editor.php

@@ -1664 +1664 @@
 
         ( function() {
-            var init, id, $wrap;
+            var initialize = function() {
+                var init, id, inPostbox, $wrap;
+                var readyState = document.readyState;
+
+                if ( readyState !== 'complete' && readyState !== 'interactive' ) {
+                    return;
+                }
+
+                for ( id in tinyMCEPreInit.mceInit ) {
+                    init      = tinyMCEPreInit.mceInit[id];
+                    $wrap     = tinymce.$( '#wp-' + id + '-wrap' );
+                    inPostbox = $wrap.parents( '.postbox' ).length > 0;
+
+                    if (
+                        ! init.wp_skip_init &&
+                        ( $wrap.hasClass( 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( id ) ) &&
+                        ( readyState === 'complete' || ( ! inPostbox && readyState === 'interactive' ) )
+                    ) {
+                        tinymce.init( init );
+
+                        if ( ! window.wpActiveEditor ) {
+                            window.wpActiveEditor = id;
+                        }
+                    }
+                }
+            }
 
             if ( typeof tinymce !== 'undefined' ) {
                 if ( tinymce.Env.ie && tinymce.Env.ie < 11 ) {
                     tinymce.$( '.wp-editor-wrap ' ).removeClass( 'tmce-active' ).addClass( 'html-active' );
-                    return;
-                }
-
-                for ( id in tinyMCEPreInit.mceInit ) {
-                    init = tinyMCEPreInit.mceInit[id];
-                    $wrap = tinymce.$( '#wp-' + id + '-wrap' );
-
-                    if ( ( $wrap.hasClass( 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( id ) ) && ! init.wp_skip_init ) {
-                        tinymce.init( init );
-
-                        if ( ! window.wpActiveEditor ) {
-                            window.wpActiveEditor = id;
-                        }
+                } else {
+                    if ( document.readyState === 'complete' ) {
+                        initialize();
+                    } else {
+                        document.addEventListener( 'readystatechange', initialize );
                     }
                 }