Changeset 44260

Timestamp:

12/17/2018 03:51:08 AM (8 years ago)

Author:

desrosj

Message:

Editor: Add custom fields meta box support in the block editor.

This brings support for the custom fields meta box into the new block editor.

The webpack and copy-webpack-plugin packages have also been updated.

This does not bump the @wordpress packages like in [43861] because of conflicts with package versions already installed in trunk. The packages will be brought up to date in a subsequent merge.

Merges [43861] and [43863] into trunk.

See #45145.
Fixes #45257.

Location:

trunk

Files:

• . (modified) (1 prop)
• package-lock.json (modified) (1 diff)
• package.json (modified) (2 diffs)
• src/wp-admin/edit-form-blocks.php (modified) (3 diffs)
• src/wp-admin/includes/meta-boxes.php (modified) (1 diff)
• src/wp-admin/includes/post.php (modified) (3 diffs)
• src/wp-admin/post.php (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (2 diffs)

trunk/package-lock.json

@@ -3563 +3563 @@
                 },
                 "copy-webpack-plugin": {
-                        "version": "4.5.2",
-                        "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz",
-                        "integrity": "sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==",
+                        "version": "4.6.0",
+                        "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+                        "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
                         "dev": true,
                         "requires": {

trunk/package.json

@@ -18 +18 @@
                 "autoprefixer": "^9.1.5",
                 "check-node-version": "3.2.0",
-                "copy-webpack-plugin": "^4.5.2",
+                "copy-webpack-plugin": "^4.6.0",
                 "cssnano": "^4.1.4",
                 "grunt": "~1.0.3",
@@ -50 +50 @@
                 "uglify-js": "^3.4.9",
                 "uglifyjs-webpack-plugin": "^2.0.1",
-                "webpack": "^4.20.2",
+                "webpack": "^4.24.0",
                 "webpack-dev-server": "^3.1.9",
                 "webpack-livereload-plugin": "^2.1.1"

trunk/src/wp-admin/edit-form-blocks.php

@@ -203 +203 @@
 }
 
+// Image sizes.
+$image_sizes   = get_intermediate_image_sizes();
+$image_sizes[] = 'full';
+
+/** This filter is documented in wp-admin/includes/media.php */
+$image_size_names = apply_filters(
+        'image_size_names_choose',
+        array(
+                'thumbnail' => __( 'Thumbnail' ),
+                'medium'    => __( 'Medium' ),
+                'large'     => __( 'Large' ),
+                'full'      => __( 'Full Size' ),
+        )
+);
+
+$available_image_sizes = array();
+foreach ( $image_sizes as $image_size_slug ) {
+        $available_image_sizes[] = array(
+                'slug' => $image_size_slug,
+                'name' => isset( $image_size_names[ $image_size_slug ] ) ? $image_size_names[ $image_size_slug ] : $image_size_slug,
+        );
+}
+
 // Lock settings.
 $user_id = wp_check_post_lock( $post->ID );
@@ -258 +281 @@
         'allowedMimeTypes'       => get_allowed_mime_types(),
         'styles'                 => $styles,
+        'availableImageSizes'    => $available_image_sizes,
         'postLock'               => $lock_details,
         'postLockUtils'          => array(
@@ -264 +288 @@
                 'ajaxUrl'     => admin_url( 'admin-ajax.php' ),
         ),
+
+        // Whether or not to load the 'postcustom' meta box is stored as a user meta
+        // field so that we're not always loading its assets.
+        'enableCustomFields'     => (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ),
 );
 

trunk/src/wp-admin/includes/meta-boxes.php

@@ -1464 +1464 @@
 
         if ( post_type_supports( $post_type, 'custom-fields' ) ) {
-                $args = array(
-                        '__back_compat_meta_box'             => ! (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ),
-                        '__block_editor_compatible_meta_box' => true,
-                );
-                add_meta_box( 'postcustom', __( 'Custom Fields' ), 'post_custom_meta_box', null, 'normal', 'core', $args );
+                $screen = get_current_screen();
+                if ( ! $screen || ! $screen->is_block_editor() || (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ) ) {
+                        add_meta_box(
+                                'postcustom',
+                                __( 'Custom Fields' ),
+                                'post_custom_meta_box',
+                                null,
+                                'normal',
+                                'core',
+                                array(
+                                        '__back_compat_meta_box'             => false,
+                                        '__block_editor_compatible_meta_box' => true,
+                                )
+                        );
+                }
         }
 

trunk/src/wp-admin/includes/post.php

@@ -2113 +2113 @@
                         'slug'  => 'common',
                         'title' => __( 'Common Blocks' ),
-                        'icon'  => 'screenoptions',
+                        'icon'  => null,
                 ),
                 array(
@@ -2215 +2215 @@
         <?php the_block_editor_meta_box_post_form_hidden_fields( $post ); ?>
         </form>
+        <form id="toggle-custom-fields-form" method="post" action="<?php echo esc_attr( admin_url( 'post.php' ) ); ?>">
+                <?php wp_nonce_field( 'toggle-custom-fields' ); ?>
+                <input type="hidden" name="action" value="toggle-custom-fields" />
+        </form>
         <?php foreach ( $locations as $location ) : ?>
                 <form class="metabox-location-<?php echo esc_attr( $location ); ?>" onsubmit="return false;">
@@ -2290 +2294 @@
         }
 
+        /**
+         * If the 'postcustom' meta box is enabled, then we need to perform some
+         * extra initialization on it.
+         */
+        $enable_custom_fields = (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true );
+        if ( $enable_custom_fields ) {
+                $script = "( function( $ ) {
+                        if ( $('#postcustom').length ) {
+                                $( '#the-list' ).wpList( {
+                                        addBefore: function( s ) {
+                                                s.data += '&post_id=$post->ID';
+                                                return s;
+                                        },
+                                        addAfter: function() {
+                                                $('table#list-table').show();
+                                        }
+                                });
+                        }
+                } )( jQuery );";
+                wp_enqueue_script( 'wp-lists' );
+                wp_add_inline_script( 'wp-lists', $script );
+        }
+
         // Reset meta box data.
         $wp_meta_boxes = $_original_meta_boxes;

trunk/src/wp-admin/post.php

@@ -313 +313 @@
                 exit();
 
+        case 'toggle-custom-fields':
+                check_admin_referer( 'toggle-custom-fields' );
+
+                $current_user_id = get_current_user_id();
+                if ( $current_user_id ) {
+                        $enable_custom_fields = (bool) get_user_meta( $current_user_id, 'enable_custom_fields', true );
+                        update_user_meta( $current_user_id, 'enable_custom_fields', ! $enable_custom_fields );
+                }
+
+                wp_safe_redirect( wp_get_referer() );
+                exit();
+
         default:
                 /**

trunk/src/wp-includes/script-loader.php

@@ -236 +236 @@
                         'lodash',
                         'wp-compose',
+                        'wp-deprecated',
                         'wp-element',
                         'wp-is-shallow-equal',
@@ -352 +353 @@
                         'wp-blocks',
                         'wp-data',
+                        'wp-deprecated',
                         'wp-escape-html',
                         'wp-polyfill',