Changeset 41558 for trunk/src/wp-includes/class-wp-customize-manager.php

Timestamp:

09/21/2017 11:03:06 PM (7 years ago)

Author:

westonruter

Message:

Customize: Introduce extensible code editor Customizer control for CodeMirror.

• Adds WP_Customize_Code_Editor_Control and wp.customize.CodeEditorControl().
• Control respects user preference for syntax highlighting, showing a textarea when user opts out.
• Code editor control takes the ad hoc code for Additional CSS and makes it reusable and extensible, for Additional CSS in core and plugins to use (such as Jetpack).
• Replace settings arg in wp_enqueue_code_editor() with separate args for codemirror, csslint, jshint, and htmlhint.
• Prefix codemirror script and style handles with wp- to prevent collisions, as also the object is exported as wp.CodeMirror in JS.
• Reduce indent size in Customizer code editor instances and Custom HTML widget to use tab size of 2 instead of 4 to save on space.

See #12423, #38707, #35395.
Fixes #41897.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (6 diffs)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -214 +214 @@
 
     /**
-     * Code Editor Settings for Custom CSS.
-     *
-     * This variable contains the settings returned by `wp_enqueue_code_editor()` which are then later output
-     * to the client in `WP_Customize_Manager::customize_pane_settings()`. A value of false means that the
-     * Custom CSS section or control was removed, or that the Syntax Highlighting user pref was turned off.
-     *
-     * @see wp_enqueue_code_editor()
-     * @see WP_Customize_Manager::enqueue_control_scripts()
-     * @see WP_Customize_Manager::customize_pane_settings()
-     * @since 4.9.0
-     * @var array|false
-     */
-    private $_custom_css_code_editor_settings = false;
-
-    /**
      * Constructor.
      *
@@ -292 +277 @@
         require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
         require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
+        require_once( ABSPATH . WPINC . '/customize/class-wp-customize-code-editor-control.php' );
         require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
         require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
@@ -3338 +3324 @@
             $control->enqueue();
         }
-
-        if ( $this->get_section( 'custom_css' ) && $this->get_control( 'custom_css' ) ) {
-            $this->_custom_css_code_editor_settings = wp_enqueue_code_editor( array(
-                'type' => 'text/css',
-            ) );
-        }
     }
 
@@ -3600 +3580 @@
                 'stylesheet' => $this->get_stylesheet(),
                 'active'     => $this->is_theme_active(),
-            ),
-            'customCss' => array(
-                'codeEditor' => $this->_custom_css_code_editor_settings,
             ),
             'url'      => array(
@@ -3737 +3714 @@
         $this->register_control_type( 'WP_Customize_Site_Icon_Control' );
         $this->register_control_type( 'WP_Customize_Theme_Control' );
+        $this->register_control_type( 'WP_Customize_Code_Editor_Control' );
 
         /* Themes */
@@ -4240 +4218 @@
         $this->add_setting( $custom_css_setting );
 
-        $this->add_control( 'custom_css', array(
-            'type'     => 'textarea',
+        $this->add_control( new WP_Customize_Code_Editor_Control( $this, 'custom_css', array(
             'section'  => 'custom_css',
             'settings' => array( 'default' => $custom_css_setting->id ),
-            'input_attrs' => array(
-                'class' => 'code', // Ensures contents displayed as LTR instead of RTL.
-            ),
-        ) );
+            'code_type' => 'text/css',
+        ) ) );
     }