Ticket #38672: 38672.extensibility.diff

src/wp-includes/customize/class-wp-customize-custom-css-setting.php

@@ -16 +16 @@
  *
  * @see WP_Customize_Setting
  */
-final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
+class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 
         /**
          * The setting type.
@@ -100 +100 @@
         }
 
         /**
-         * Filter wp_get_custom_css for applying customized value to return value.
+         * Filter `wp_get_custom_css` for applying the customized value.
+         *
+         * This is used in the preview when `wp_get_custom_css()` is called for rendering the styles.
          *
          * @since 4.7.0
          * @access private
+         * @see wp_get_custom_css()
          *
          * @param string $css        Original CSS.
          * @param string $stylesheet Current stylesheet.
@@ -120 +123 @@
         }
 
         /**
-         * Fetch the value of the setting.
+         * Fetch the value of the setting. Will return the previewed value when `preview()` is called.
          *
          * @since 4.7.0
          * @access public
@@ -128 +131 @@
          * @return string
          */
         public function value() {
-                $value = wp_get_custom_css( $this->stylesheet );
+                if ( $this->is_previewed && null !== $this->post_value( null ) ) {
+                        return $this->post_value();
+                }
+                $value = '';
+                $post = wp_get_custom_css_post( $this->stylesheet );
+                if ( $post ) {
+                        $value = $post->post_content;
+                }
                 if ( empty( $value ) ) {
                         $value = $this->default;
                 }

src/wp-includes/js/customize-preview.js

@@ -594 +594 @@
                 };
         } )();
 
+        api.settingPreviewHandlers = {
+
+                /**
+                 * Preview changes to custom logo.
+                 *
+                 * @param {number} attachmentId Attachment ID for custom logo.
+                 * @returns {void}
+                 */
+                custom_logo: function( attachmentId ) {
+                        $( 'body' ).toggleClass( 'wp-custom-logo', !! attachmentId );
+                },
+
+                /**
+                 * Preview changes to custom css.
+                 *
+                 * @param {string} value Custom CSS..
+                 * @returns {void}
+                 */
+                custom_css: function( value ) {
+                        $( '#wp-custom-css' ).text( value );
+                },
+
+                /**
+                 * Preview changes to any of the background settings.
+                 *
+                 * @returns {void}
+                 */
+                background: function() {
+                        var css = '', settings = {};
+
+                        _.each( ['color', 'image', 'preset', 'position_x', 'position_y', 'size', 'repeat', 'attachment'], function( prop ) {
+                                settings[ prop ] = api( 'background_' + prop );
+                        } );
+
+                        /*
+                         * The body will support custom backgrounds if either the color or image are set.
+                         *
+                         * See get_body_class() in /wp-includes/post-template.php
+                         */
+                        $( document.body ).toggleClass( 'custom-background', !! ( settings.color() || settings.image() ) );
+
+                        if ( settings.color() ) {
+                                css += 'background-color: ' + settings.color() + ';';
+                        }
+
+                        if ( settings.image() ) {
+                                css += 'background-image: url("' + settings.image() + '");';
+                                css += 'background-size: ' + settings.size() + ';';
+                                css += 'background-position: ' + settings.position_x() + ' ' + settings.position_y() + ';';
+                                css += 'background-repeat: ' + settings.repeat() + ';';
+                                css += 'background-attachment: ' + settings.attachment() + ';';
+                        }
+
+                        $( '#custom-background-css' ).text( 'body.custom-background { ' + css + ' }' );
+                }
+        };
+
         $( function() {
                 var bg, setValue;
 
@@ -759 +816 @@
                         return 'background_' + prop;
                 } );
 
-                api.when.apply( api, bg ).done( function( color, image, preset, positionX, positionY, size, repeat, attachment ) {
-                        var body = $(document.body),
-                                head = $('head'),
-                                style = $('#custom-background-css'),
-                                update;
-
-                        update = function() {
-                                var css = '';
-
-                                // The body will support custom backgrounds if either
-                                // the color or image are set.
-                                //
-                                // See get_body_class() in /wp-includes/post-template.php
-                                body.toggleClass( 'custom-background', !! ( color() || image() ) );
-
-                                if ( color() )
-                                        css += 'background-color: ' + color() + ';';
-
-                                if ( image() ) {
-                                        css += 'background-image: url("' + image() + '");';
-                                        css += 'background-size: ' + size() + ';';
-                                        css += 'background-position: ' + positionX() + ' ' + positionY() + ';';
-                                        css += 'background-repeat: ' + repeat() + ';';
-                                        css += 'background-attachment: ' + attachment() + ';';
-                                }
-
-                                // Refresh the stylesheet by removing and recreating it.
-                                style.remove();
-                                style = $('<style type="text/css" id="custom-background-css">body.custom-background { ' + css + ' }</style>').appendTo( head );
-                        };
-
+                api.when.apply( api, bg ).done( function() {
                         $.each( arguments, function() {
-                                this.bind( update );
+                                this.bind( api.settingPreviewHandlers.background );
                         });
                 });
 
@@ -802 +829 @@
                  *
                  * @since 4.5.0
                  */
-                api( 'custom_logo', function( setting ) {
-                        $( 'body' ).toggleClass( 'wp-custom-logo', !! setting.get() );
-                        setting.bind( function( attachmentId ) {
-                                $( 'body' ).toggleClass( 'wp-custom-logo', !! attachmentId );
-                        });
-                });
+                api( 'custom_logo', function ( setting ) {
+                        api.settingPreviewHandlers.custom_logo.call( setting, setting.get() );
+                        setting.bind( api.settingPreviewHandlers.custom_logo );
+                } );
 
-                api( 'custom_css[' + api.settings.theme.stylesheet + ']', function( value ) {
-                        value.bind( function( to ) {
-                                $( '#wp-custom-css' ).text( to );
-                        } );
+                api( 'custom_css[' + api.settings.theme.stylesheet + ']', function( setting ) {
+                        setting.bind( api.settingPreviewHandlers.custom_css );
                 } );
 
                 api.trigger( 'preview-ready' );

src/wp-includes/theme.php

@@ -1500 +1500 @@
                 $color = false;
         }
 
-        if ( ! $background && ! $color )
+        if ( ! $background && ! $color ) {
+                if ( is_customize_preview() ) {
+                        echo '<style type="text/css" id="custom-background-css"></style>';
+                }
                 return;
+        }
 
         $style = $color ? "background-color: #$color;" : '';
 
@@ -1621 +1625 @@
 }
 
 /**
- * Fetch the saved Custom CSS content.
+ * Fetch the saved Custom CSS content for rendering.
  *
  * @since 4.7.0
  * @access public