<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[20908] trunk/wp-includes: Theme Customizer: Improve default background property handling.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20908">20908</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-05-25 18:41:22 +0000 (Fri, 25 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Improve default background property handling. see <a href="http://core.trac.wordpress.org/ticket/20600">#20600</a>, <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.
If the custom background default wp-head-callback (_custom_background_cb) is used, we use postMessage for all custom background properties. Otherwise, we use full refreshes.
When using postMessage, the preview recalculates the custom background CSS block, allowing it to omit CSS values when they are not present and fall back on the original CSS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpcustomizemanagerphp">trunk/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunkwpincludesjscustomizepreviewdevjs">trunk/wp-includes/js/customize-preview.dev.js</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-manager.php (20907 => 20908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-manager.php 2012-05-25 18:29:05 UTC (rev 20907)
+++ trunk/wp-includes/class-wp-customize-manager.php 2012-05-25 18:41:22 UTC (rev 20908)
</span><span class="lines">@@ -649,7 +649,6 @@
</span><span class="cx"> 'default' => get_theme_support( 'custom-background', 'default-color' ),
</span><span class="cx"> 'sanitize_callback' => 'sanitize_hexcolor',
</span><span class="cx"> 'theme_supports' => 'custom-background',
</span><del>- 'transport' => 'postMessage',
</del><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $this->add_control( new WP_Customize_Color_Control( $this, 'background_color', array(
</span><span class="lines">@@ -716,6 +715,14 @@
</span><span class="cx"> ),
</span><span class="cx"> ) );
</span><span class="cx">
</span><ins>+ // If the theme is using the default background callback, we can update
+ // the background CSS using postMessage.
+ if ( get_theme_support( 'custom-background', 'wp-head-callback' ) === '_custom_background_cb' ) {
+ foreach ( array( 'color', 'image', 'position_x', 'repeat', 'attachment' ) as $prop ) {
+ $this->get_setting( 'background_' . $prop )->transport = 'postMessage';
+ }
+ }
+
</ins><span class="cx"> /* Nav Menus */
</span><span class="cx">
</span><span class="cx"> $locations = get_registered_nav_menus();
</span></span></pre></div>
<a id="trunkwpincludesjscustomizepreviewdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-preview.dev.js (20907 => 20908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-preview.dev.js 2012-05-25 18:29:05 UTC (rev 20907)
+++ trunk/wp-includes/js/customize-preview.dev.js 2012-05-25 18:41:22 UTC (rev 20908)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> if ( ! api.settings )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var preview, body;
</del><ins>+ var preview, bg;
</ins><span class="cx">
</span><span class="cx"> preview = new api.Preview( window.location.href );
</span><span class="cx">
</span><span class="lines">@@ -75,11 +75,36 @@
</span><span class="cx"> value.set.apply( value, args );
</span><span class="cx"> });
</span><span class="cx">
</span><del>- body = $(document.body);
- // Auto update background color by default
- api( 'background_color', function( value ) {
- value.bind( function( to ) {
- body.css( 'background-color', to ? '#' + to : '' );
</del><ins>+ /* Custom Backgrounds */
+ bg = $.map(['color', 'image', 'position_x', 'repeat', 'attachment'], function( prop ) {
+ return 'background_' + prop;
+ });
+
+ api.when.apply( api, bg ).done( function( color, image, position_x, repeat, attachment ) {
+ var style = $('#custom-background-css'),
+ update;
+
+ if ( ! style.length )
+ return;
+
+ update = function() {
+ var css = '';
+
+ if ( color() )
+ css += 'background-color: #' + color() + ';';
+
+ if ( image() ) {
+ css += 'background-image: url("' + image() + '");';
+ css += 'background-position: top ' + position_x() + ';';
+ css += 'background-repeat: ' + repeat() + ';';
+ css += 'background-position: top ' + attachment() + ';';
+ }
+
+ style.html( 'body.custom-background { ' + css + ' }' );
+ };
+
+ $.each( arguments, function() {
+ this.bind( update );
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (20907 => 20908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2012-05-25 18:29:05 UTC (rev 20907)
+++ trunk/wp-includes/theme.php 2012-05-25 18:41:22 UTC (rev 20908)
</span><span class="lines">@@ -1130,7 +1130,7 @@
</span><span class="cx"> $style .= $image . $repeat . $position . $attachment;
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><del>-<style type="text/css">
</del><ins>+<style type="text/css" id="custom-background-css">
</ins><span class="cx"> body.custom-background { <?php echo trim( $style ); ?> }
</span><span class="cx"> </style>
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>