Ticket #53762: 53762.4.diff

src/js/_enqueues/lib/quicktags.js

@@ -435 +435 @@
                         ariaLabel = this.attr && this.attr.ariaLabel ? ' aria-label="' + _escape( this.attr.ariaLabel ) + '"' : '',
                         val = this.display ? ' value="' + _escape( this.display ) + '"' : '',
                         id = this.id ? ' id="' + _escape( idPrefix + this.id ) + '"' : '',
-                        dfw = ( wp = window.wp ) && wp.oldEditor && wp.oldEditor.dfw;
+                        dfw = ( wp = window.wp ) && wp.editor && wp.editor.dfw;
 
                 if ( this.id === 'fullscreen' ) {
                         return '<button type="button"' + id + ' class="ed_button qt-dfw qt-fullscreen"' + title + ariaLabel + '></button>';
@@ -681 +681 @@
         qt.DFWButton.prototype.callback = function() {
                 var wp;
 
-                if ( ! ( wp = window.wp ) || ! wp.oldEditor || ! wp.oldEditor.dfw ) {
+                if ( ! ( wp = window.wp ) || ! wp.editor || ! wp.editor.dfw ) {
                         return;
                 }
 
-                window.wp.oldEditor.dfw.toggle();
+                window.wp.editor.dfw.toggle();
         };
 
         qt.TextDirectionButton = function() {

src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js

@@ -12 +12 @@
                 __ = editor.editorManager.i18n.translate,
                 $ = window.jQuery,
                 wp = window.wp,
-                hasWpautop = ( wp && wp.oldEditor && wp.oldEditor.autop && editor.getParam( 'wpautop', true ) ),
+                hasWpautop = ( wp && wp.editor && wp.editor.autop && editor.getParam( 'wpautop', true ) ),
                 wpTooltips = false;
 
         if ( $ ) {
@@ -130 +130 @@
 
                         if ( event.load && event.format !== 'raw' ) {
                                 if ( hasWpautop ) {
-                                        event.content = wp.oldEditor.autop( event.content );
+                                        event.content = wp.editor.autop( event.content );
                                 } else {
                                         // Prevent creation of paragraphs out of multiple HTML comments.
                                         event.content = event.content.replace( /-->\s+<!--/g, '--><!--' );
@@ -601 +601 @@
                 event.content = event.content.replace( /<p>(?:<br ?\/?>|\u00a0|\uFEFF| )*<\/p>/g, '<p>&nbsp;</p>' );
 
                 if ( hasWpautop ) {
-                        event.content = wp.oldEditor.removep( event.content );
+                        event.content = wp.editor.removep( event.content );
                 } else {
                         // Restore formatting of block boundaries.
                         event.content = event.content.replace( /-->\s*<!-- wp:/g, '-->\n\n<!-- wp:' );

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

@@ -5 +5 @@
 window.wp = window.wp || {};
 
 ( function( $, wp ) {
-        wp.editor = wp.oldEditor = wp.oldEditor || {};
+        wp.editor = wp.editor || {};
 
         /**
          * Utility functions for the editor.
@@ -1191 +1191 @@
                         } );
                 }
 
-                wp.oldEditor.autop = wpautop;
-                wp.oldEditor.removep = pre_wpautop;
+                wp.editor.autop = wpautop;
+                wp.editor.removep = pre_wpautop;
 
                 exports = {
                         go: switchEditor,
@@ -1241 +1241 @@
          *    }
          * }
          */
-        wp.oldEditor.initialize = function( id, settings ) {
+        wp.editor.initialize = function( id, settings ) {
                 var init;
                 var defaults;
 
-                if ( ! $ || ! id || ! wp.oldEditor.getDefaultSettings ) {
+                if ( ! $ || ! id || ! wp.editor.getDefaultSettings ) {
                         return;
                 }
 
-                defaults = wp.oldEditor.getDefaultSettings();
+                defaults = wp.editor.getDefaultSettings();
 
                 // Initialize TinyMCE by default.
                 if ( ! settings ) {
@@ -1349 +1349 @@
         /**
          * Remove one editor instance.
          *
-         * Intended for use with editors that were initialized with wp.oldEditor.initialize().
+         * Intended for use with editors that were initialized with wp.editor.initialize().
          *
          * @since 4.8.0
          *
          * @param {string} id The HTML id of the editor textarea.
          */
-        wp.oldEditor.remove = function( id ) {
+        wp.editor.remove = function( id ) {
                 var mceInstance, qtInstance,
                         $wrap = $( '#wp-' + id + '-wrap' );
 
@@ -1388 +1388 @@
         /**
          * Get the editor content.
          *
-         * Intended for use with editors that were initialized with wp.oldEditor.initialize().
+         * Intended for use with editors that were initialized with wp.editor.initialize().
          *
          * @since 4.8.0
          *
@@ -1395 +1395 @@
          * @param {string} id The HTML id of the editor textarea.
          * @return The editor content.
          */
-        wp.oldEditor.getContent = function( id ) {
+        wp.editor.getContent = function( id ) {
                 var editor;
 
                 if ( ! $ || ! id ) {

src/js/_enqueues/wp/editor/dfw.js

@@ -33 +33 @@
                         $sideSortables = $( '#side-sortables' ),
                         $postboxContainer = $( '#postbox-container-1' ),
                         $postBody = $('#post-body'),
-                        fullscreen = window.wp.oldEditor && window.wp.oldEditor.fullscreen,
+                        fullscreen = window.wp.editor && window.wp.editor.fullscreen,
                         mceEditor,
                         mceBind = function(){},
                         mceUnbind = function(){},
@@ -1603 +1603 @@
                 }
 
                 window.wp = window.wp || {};
-                window.wp.oldEditor = window.wp.oldEditor || {};
-                window.wp.oldEditor.dfw = {
+                window.wp.editor = window.wp.editor || {};
+                window.wp.editor.dfw = {
                         activate: activate,
                         deactivate: deactivate,
                         isActive: isActive,

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

@@ -970 +970 @@
                 <script type="text/javascript">
                 window.wp = window.wp || {};
                 window.wp.editor = window.wp.editor || {};
-                window.wp.oldEditor = window.wp.oldEditor || {};
-
-                // Add getDefaultSettings() to both wp.editor and wp.oldEditor for back compat.
-                // Use of wp.editor for "old editor" functionality should be deprecated.
-                window.wp.editor.getDefaultSettings = window.wp.oldEditor.getDefaultSettings = function() {
+                window.wp.editor.getDefaultSettings = function() {
                         return {
                                 tinymce: <?php echo $settings; ?>,
                                 quicktags: {

src/wp-includes/general-template.php

@@ -3524 +3524 @@
  * Outputs the editor scripts, stylesheets, and default settings.
  *
  * The editor can be initialized when needed after page load.
- * See wp.oldEditor.initialize() in wp-admin/js/editor.js for initialization options.
+ * See wp.editor.initialize() in wp-admin/js/editor.js for initialization options.
  *
  * @uses _WP_Editors
  * @since 4.8.0