Changeset 1910026 for classic-editor

Timestamp:

07/16/2018 07:27:40 PM (7 years ago)

Author:

azaozz

Message:

Classic Editor:

• Update the option text to make it clearer.
• Remove the Try Gutenberg dashboard widget.
• Update the screenshots.
• Add/remove Gutenberg hooks as needed.

Version 0.3.

Location:

classic-editor/trunk

Files:

• classic-editor.php (modified) (9 diffs)
• readme.txt (modified) (1 diff)
• screenshot-1.png (modified) (previous)
• screenshot-2.png (modified) (previous)
• screenshot-3.png (modified) (previous)

classic-editor/trunk/classic-editor.php

@@ -6 +6 @@
  * Plugin URI:  https://wordpress.org
  * Description: Enables the WordPress classic editor and the old-style Edit Post screen layout (TinyMCE, meta boxes, etc.). Supports the older plugins that extend this screen.
- * Version:     0.2
+ * Version:     0.3
  * Author:      WordPress Contributors
  * License:     GPL-2.0+
@@ -35 +35 @@
  */
 function classic_editor_is_gutenberg_active() {
-    if ( in_array( 'gutenberg/gutenberg.php', (array) get_option( 'active_plugins', array() ) ) ||
+    if ( in_array( 'gutenberg/gutenberg.php', (array) get_option( 'active_plugins' ) ) ||
         ( is_multisite() && array_key_exists( 'gutenberg/gutenberg.php', (array) get_site_option( 'active_sitewide_plugins' ) ) ) ) {
 
@@ -59 +59 @@
         // gutenberg.php
         remove_action( 'admin_menu', 'gutenberg_menu' );
-        remove_action( 'load-post.php', 'gutenberg_intercept_edit_post' );
-        remove_action( 'load-post-new.php', 'gutenberg_intercept_post_new' );
         remove_action( 'admin_notices', 'gutenberg_wordpress_version_notice' );
         remove_action( 'admin_init', 'gutenberg_redirect_demo' );
 
         remove_filter( 'replace_editor', 'gutenberg_init' );
-
-        // lib/blocks.php
-        remove_filter( 'wp_insert_post_data', 'gutenberg_wpautop_insert_post_data' );
 
         // lib/client-assets.php
@@ -76 +71 @@
 
         // lib/compat.php
-        remove_action( 'wp_enqueue_scripts', 'gutenberg_ensure_wp_api_request', 20 );
-        remove_action( 'admin_enqueue_scripts', 'gutenberg_ensure_wp_api_request', 20 );
-
-        remove_filter( 'wp_editor_settings', 'gutenberg_disable_editor_settings_wpautop' );
         remove_filter( 'wp_refresh_nonces', 'gutenberg_add_rest_nonce_to_heartbeat_response_headers' );
 
         // lib/register.php
         remove_action( 'plugins_loaded', 'gutenberg_trick_plugins_into_registering_meta_boxes' );
-        remove_action( 'rest_api_init', 'gutenberg_register_rest_routes' );
-        remove_action( 'rest_api_init', 'gutenberg_register_rest_api_post_revisions' );
         remove_action( 'edit_form_top', 'gutenberg_remember_classic_editor_when_saving_posts' );
 
@@ -91 +80 @@
         remove_filter( 'get_edit_post_link', 'gutenberg_revisions_link_to_editor' );
         remove_filter( 'wp_prepare_revision_for_js', 'gutenberg_revisions_restore' );
+
+        // lib/rest-api.php
+        remove_action( 'rest_api_init', 'gutenberg_register_rest_routes' );
+        remove_action( 'rest_api_init', 'gutenberg_add_taxonomy_visibility_field' );
+
+        remove_filter( 'rest_request_after_callbacks', 'gutenberg_filter_oembed_result' );
+        remove_filter( 'registered_post_type', 'gutenberg_register_post_prepare_functions' );
+        remove_filter( 'registered_taxonomy', 'gutenberg_register_taxonomy_prepare_functions' );
+        remove_filter( 'rest_index', 'gutenberg_ensure_wp_json_has_theme_supports' );
+        remove_filter( 'rest_request_before_callbacks', 'gutenberg_handle_early_callback_checks' );
+        remove_filter( 'rest_user_collection_params', 'gutenberg_filter_user_collection_parameters' );
+        remove_filter( 'rest_request_after_callbacks', 'gutenberg_filter_request_after_callbacks' );
 
         // lib/meta-box-partial-page.php
@@ -108 +109 @@
         // gutenberg.php
         remove_filter( 'admin_url', 'gutenberg_modify_add_new_button_url' );
+        remove_action( 'admin_print_scripts-edit.php', 'gutenberg_replace_default_add_new_button' );
+
+        // lib/register.php
+        remove_filter( 'display_post_states', 'gutenberg_add_gutenberg_post_state' );
+
+        // lib/plugin-compat.php
+        remove_filter( 'rest_pre_insert_post', 'gutenberg_remove_wpcom_markdown_support' );
+
+        // Keep
 
         // lib/blocks.php
         // remove_filter( 'the_content', 'do_blocks', 9 );
 
-        // lib/register.php
-        remove_filter( 'display_post_states', 'gutenberg_add_gutenberg_post_state', 10 );
-
-        // lib/plugin-compat.php
-        remove_filter( 'rest_pre_insert_post', 'gutenberg_remove_wpcom_markdown_support' );
-
-        // Keep
-        // remove_filter( 'rest_index', 'gutenberg_ensure_wp_json_has_permalink_structure' );
+        // Continue to disable wpautop inside TinyMCE for posts that were started in Gutenberg.
+        // remove_filter( 'wp_editor_settings', 'gutenberg_disable_editor_settings_wpautop' );
+
+        // Keep the tweaks to the PHP wpautop.
         // add_filter( 'the_content', 'wpautop' );
         // remove_filter( 'the_content', 'gutenberg_wpautop', 8 );
+
         // remove_action( 'init', 'gutenberg_register_post_types' );
     } else {
@@ -140 +147 @@
     // Gutenberg plugin: remove the "Classic editor" row actions.
     remove_action( 'admin_init', 'gutenberg_add_edit_link_filters' );
+
+    // Remove the "Try Gutenberg" dashboard widget.
+    remove_action( 'try_gutenberg_panel', 'wp_try_gutenberg_panel' );
 }
 
@@ -159 +169 @@
  */
 function classic_editor_settings() {
-    $no_replace = get_option( 'classic-editor-replace' ) === 'no-replace';
+    $replace = get_option( 'classic-editor-replace' ) !== 'no-replace';
 
     ?>
-    <p id="classic-editor-options" style="margin: 0;"><label>
-        <input type="checkbox" name="classic-editor-replace" value="no-replace"<?php if ( $no_replace ) echo ' checked'; ?> />
-        <?php _e( 'Do not replace the editor. Add alternate links to the Posts and Pages screens for editing with the Classic editor.', 'classic-editor' ); ?>
-    </label></p>
+    <p id="classic-editor-options" style="margin: 0;">
+        <input type="radio" name="classic-editor-replace" id="classic-editor-replace" value="replace"<?php if ( $replace ) echo ' checked'; ?> />
+        <label for="classic-editor-replace">
+        <?php _e( 'Replace the Gutenberg editor with the Classic editor.', 'classic-editor' ); ?>
+        </label>
+        <br>
+
+        <input type="radio" name="classic-editor-replace" id="classic-editor-no-replace" value="no-replace"<?php if ( ! $replace ) echo ' checked'; ?> />
+        <label for="classic-editor-no-replace">
+        <?php _e( 'Use the Gutenberg editor by default and include optional links back to the Classic editor.', 'classic-editor' ); ?>
+        </label>
+    </p>
     <script>
     jQuery( 'document' ).ready( function( $ ) {
         if ( window.location.hash === '#classic-editor-options' ) {
-            $( '#classic-editor-options' ).closest( 'td' ).css( 'border', '1px solid #aaa' );
+            $( '#classic-editor-options' ).closest( 'td' ).addClass( 'highlight' );
         }
     } );
@@ -334 +352 @@
 function classic_editor_activate() {
     if ( ! get_option( 'classic-editor-replace' ) ) {
-        update_option( 'classic-editor-replace', 'no-replace' );
+        update_option( 'classic-editor-replace', 'replace' );
     }
 }

classic-editor/trunk/readme.txt

@@ -27 +27 @@
 
 == Changelog ==
+= 0.3 =
+Updated the option from a checkbox to couple of radio buttons, seems clearer. Thanks to @designsimply for the label text suggestions.
+Some general updates and cleanup.
+
 = 0.2 =
 Update for Gutenberg 1.9.