Changeset 51407

Timestamp:

07/12/2021 01:27:44 PM (3 years ago)

Author:

desrosj

Message:

TinyMCE: ensure initialization runs in all cases on 'interactive' and 'complete' readyState.

Fixes a rare bug when the init code is inserted in the DOM after the page has finished loading.

Props Collizo4sky, azaozz.
Merges [51402] to the 5.8 branch.
Fixes #53632.

Location:

branches/5.8

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-editor.php (modified) (3 diffs)

branches/5.8/src/wp-includes/class-wp-editor.php

@@ -1664 +1664 @@
 
         ( function() {
-            var initialize = function() {
+            var initialized = [];
+            var initialize  = function() {
                 var init, id, inPostbox, $wrap;
                 var readyState = document.readyState;
@@ -1673 +1674 @@
 
                 for ( id in tinyMCEPreInit.mceInit ) {
+                    if ( initialized.indexOf( id ) > -1 ) {
+                        continue;
+                    }
+
                     init      = tinyMCEPreInit.mceInit[id];
                     $wrap     = tinymce.$( '#wp-' + id + '-wrap' );
@@ -1680 +1685 @@
                         ! init.wp_skip_init &&
                         ( $wrap.hasClass( 'tmce-active' ) || ! tinyMCEPreInit.qtInit.hasOwnProperty( id ) ) &&
-                        ( ( inPostbox && readyState === 'complete' ) || ( ! inPostbox && readyState === 'interactive' ) )
+                        ( readyState === 'complete' || ( ! inPostbox && readyState === 'interactive' ) )
                     ) {
                         tinymce.init( init );
+                        initialized.push( id );
 
                         if ( ! window.wpActiveEditor ) {