Editor: Revert [51748] and [51649]. They intorduced a bug where wp.editor may be replaced with wp.oldEditor in certain cases.

Props desrosj, davidbinda, azaozz.
Merges [51768] to the 5.8 branch.
Fixes #53762.

Built from https://develop.svn.wordpress.org/branches/5.8@51770


git-svn-id: http://core.svn.wordpress.org/branches/5.8@51377 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/js/editor-expand.js

@@ -33,7 +33,7 @@
 			$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,8 +1603,8 @@
 		}
 
 		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,

wp-admin/js/editor.js

@@ -5,7 +5,7 @@
 window.wp = window.wp || {};
 
 ( function( $, wp ) {
-	wp.editor = wp.oldEditor = wp.oldEditor || {};
+	wp.editor = wp.editor || {};
 
 	/**
 	 * Utility functions for the editor.
@@ -1191,8 +1191,8 @@ window.wp = window.wp || {};
 			} );
 		}
 
-		wp.oldEditor.autop = wpautop;
-		wp.oldEditor.removep = pre_wpautop;
+		wp.editor.autop = wpautop;
+		wp.editor.removep = pre_wpautop;
 
 		exports = {
 			go: switchEditor,
@@ -1241,15 +1241,15 @@ window.wp = window.wp || {};
 	 *    }
 	 * }
 	 */
-	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,13 +1349,13 @@ window.wp = window.wp || {};
 	/**
 	 * 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,14 +1388,14 @@ window.wp = window.wp || {};
 	/**
 	 * 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
 	 *
 	 * @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 ) {

wp-includes/class-wp-editor.php

@@ -970,11 +970,7 @@ final class _WP_Editors {
 		<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: {

wp-includes/general-template.php

@@ -3524,7 +3524,7 @@ function wp_editor( $content, $editor_id, $settings = array() ) {
  * 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

wp-includes/js/quicktags.js

@@ -435,7 +435,7 @@ window.edToolbar = function(){};
 			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,11 +681,11 @@ window.edToolbar = function(){};
 	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() {

wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -12,7 +12,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 		__ = 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,7 +130,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 
 			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,7 +601,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 		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:' );

wp-includes/version.php

@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8.1-RC1-51767';
+$wp_version = '5.8.1-RC1-51770';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.