Ticket #53762: 53762.3.diff

src/js/_enqueues/wp/editor/base.js

@@ -5 +5 @@
 window.wp = window.wp || {};
 
 ( function( $, wp ) {
-        wp.editor = wp.oldEditor = wp.oldEditor || {};
+        // Back-compat for places that need the old wp.editor outside of the block editor.
+        window.wp.editor = window.wp.editor || {};
+        window.wp.oldEditor = window.wp.oldEditor || {};
 
         /**
          * Utility functions for the editor.
@@ -1191 +1193 @@
                         } );
                 }
 
-                wp.oldEditor.autop = wpautop;
-                wp.oldEditor.removep = pre_wpautop;
+                wp.editor.autop = wp.oldEditor.autop = wpautop;
+                wp.editor.removep = wp.oldEditor.removep = pre_wpautop;
 
                 exports = {
                         go: switchEditor,
@@ -1241 +1243 @@
          *    }
          * }
          */
-        wp.oldEditor.initialize = function( id, settings ) {
+        wp.editor.initialize = wp.oldEditor.initialize = function( id, settings ) {
                 var init;
                 var defaults;
 
-                if ( ! $ || ! id || ! wp.oldEditor.getDefaultSettings ) {
+                if ( ! $ || ! id ) {
                         return;
                 }
 
-                defaults = wp.oldEditor.getDefaultSettings();
+                if ( wp.oldEditor.getDefaultSettings ) {
+                        defaults = wp.oldEditor.getDefaultSettings();
+                } else if ( wp.editor.getDefaultSettings ) {
+                        defaults = wp.editor.getDefaultSettings();
+                } else {
+                        // Default settings are missing.
+                        return;
+                }
 
                 // Initialize TinyMCE by default.
                 if ( ! settings ) {
@@ -1355 +1364 @@
          *
          * @param {string} id The HTML id of the editor textarea.
          */
-        wp.oldEditor.remove = function( id ) {
+        wp.editor.remove = wp.oldEditor.remove = function( id ) {
                 var mceInstance, qtInstance,
                         $wrap = $( '#wp-' + id + '-wrap' );
 
@@ -1395 +1404 @@
          * @param {string} id The HTML id of the editor textarea.
          * @return The editor content.
          */
-        wp.oldEditor.getContent = function( id ) {
+        wp.editor.getContent = wp.oldEditor.getContent = function( id ) {
                 var editor;
 
                 if ( ! $ || ! id ) {