Changeset 41558 for trunk/src/wp-includes/general-template.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/general-template.php (modified) (4 diffs)

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

@@ -3126 +3126 @@
  *     Args.
  *
- *     @type string   $type     The MIME type of the file to be edited.
- *     @type string   $file     Filename to be edited. Extension is used to sniff the type. Can be supplied as alternative to `$type` param.
- *     @type array    $settings Settings to merge on top of defaults which derive from `$type` or `$file` args.
- *     @type WP_Theme $theme    Theme being edited when on theme editor.
- *     @type string   $plugin   Plugin being edited when on plugin editor.
+ *     @type string   $type       The MIME type of the file to be edited.
+ *     @type string   $file       Filename to be edited. Extension is used to sniff the type. Can be supplied as alternative to `$type` param.
+ *     @type WP_Theme $theme      Theme being edited when on theme editor.
+ *     @type string   $plugin     Plugin being edited when on plugin editor.
+ *     @type array    $codemirror Additional CodeMirror setting overrides.
+ *     @type array    $csslint    CSSLint rule overrides.
+ *     @type array    $jshint     JSHint rule overrides.
+ *     @type array    $htmlhint   JSHint rule overrides.
  * }
  * @returns array|false Settings for the enqueued code editor, or false if the editor was not enqueued .
@@ -3409 +3412 @@
 
     // Let settings supplied via args override any defaults.
-    if ( isset( $args['settings'] ) ) {
-        foreach ( $args['settings'] as $key => $value ) {
-            $settings[ $key ] = array_merge(
-                $settings[ $key ],
-                $value
-            );
-        }
+    foreach ( wp_array_slice_assoc( $args, array( 'codemirror', 'csslint', 'jshint', 'htmlhint' ) ) as $key => $value ) {
+        $settings[ $key ] = array_merge(
+            $settings[ $key ],
+            $value
+        );
     }
 
@@ -3429 +3430 @@
      *     Args passed when calling `wp_enqueue_code_editor()`.
      *
-     *     @type string   $type     The MIME type of the file to be edited.
-     *     @type string   $file     Filename being edited.
-     *     @type array    $settings Settings to merge on top of defaults which derive from `$type` or `$file` args.
-     *     @type WP_Theme $theme    Theme being edited when on theme editor.
-     *     @type string   $plugin   Plugin being edited when on plugin editor.
+     *     @type string   $type       The MIME type of the file to be edited.
+     *     @type string   $file       Filename being edited.
+     *     @type WP_Theme $theme      Theme being edited when on theme editor.
+     *     @type string   $plugin     Plugin being edited when on plugin editor.
+     *     @type array    $codemirror Additional CodeMirror setting overrides.
+     *     @type array    $csslint    CSSLint rule overrides.
+     *     @type array    $jshint     JSHint rule overrides.
+     *     @type array    $htmlhint   JSHint rule overrides.
      * }
      */
@@ -3444 +3448 @@
     wp_enqueue_script( 'code-editor' );
     wp_enqueue_style( 'code-editor' );
-
-    wp_enqueue_script( 'codemirror' );
-    wp_enqueue_style( 'codemirror' );
 
     if ( isset( $settings['codemirror']['mode'] ) ) {