Changeset 51768

Timestamp:

09/08/2021 11:28:43 PM (3 years ago)

Author:

azaozz

Message:

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.
Fixes #53762.

Location:

trunk/src

Files:

• js/_enqueues/lib/quicktags.js (modified) (2 diffs)
• js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js (modified) (3 diffs)
• js/_enqueues/wp/editor/base.js (modified) (7 diffs)
• js/_enqueues/wp/editor/dfw.js (modified) (2 diffs)
• wp-includes/class-wp-editor.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)

trunk/src/js/_enqueues/lib/quicktags.js

@@ -436 +436 @@
             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' ) {
@@ -682 +682 @@
         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();
     };
 

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

@@ -13 +13 @@
         $ = 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;
 
@@ -131 +131 @@
             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.
@@ -602 +602 @@
 
         if ( hasWpautop ) {
-            event.content = wp.oldEditor.removep( event.content );
+            event.content = wp.editor.removep( event.content );
         } else {
             // Restore formatting of block boundaries.

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

@@ -6 +6 @@
 
 ( function( $, wp ) {
-    wp.editor = wp.oldEditor = wp.oldEditor || {};
+    wp.editor = wp.editor || {};
 
     /**
@@ -1192 +1192 @@
         }
 
-        wp.oldEditor.autop = wpautop;
-        wp.oldEditor.removep = pre_wpautop;
+        wp.editor.autop = wpautop;
+        wp.editor.removep = pre_wpautop;
 
         exports = {
@@ -1242 +1242 @@
      * }
      */
-    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.
@@ -1350 +1350 @@
      * 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
@@ -1356 +1356 @@
      * @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' );
@@ -1389 +1389 @@
      * 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
@@ -1396 +1396 @@
      * @return The editor content.
      */
-    wp.oldEditor.getContent = function( id ) {
+    wp.editor.getContent = function( id ) {
         var editor;
 

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

@@ -34 +34 @@
             $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(){},
@@ -1604 +1604 @@
 
         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,

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

@@ -971 +971 @@
         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; ?>,

trunk/src/wp-includes/general-template.php

@@ -3525 +3525 @@
  *
  * 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