<!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>[20263] trunk/wp-includes: Theme Customizer: Add background repeat, position, and attachment settings.</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/20263">20263</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-03-22 08:07:44 +0000 (Thu, 22 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Add background repeat, position, and attachment settings. Change visibility parameter to accept a string or array( , ). see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpcustomizesettingphp">trunk/wp-includes/class-wp-customize-setting.php</a></li>
<li><a href="#trunkwpincludesclasswpcustomizephp">trunk/wp-includes/class-wp-customize.php</a></li>
<li><a href="#trunkwpincludescustomizecontrolsphp">trunk/wp-includes/customize-controls.php</a></li>
<li><a href="#trunkwpincludesjscustomizecontrolsdevjs">trunk/wp-includes/js/customize-controls.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpcustomizesettingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-setting.php (20262 => 20263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-setting.php 2012-03-22 07:58:24 UTC (rev 20262)
+++ trunk/wp-includes/class-wp-customize-setting.php 2012-03-22 08:07:44 UTC (rev 20263)
</span><span class="lines">@@ -308,8 +308,14 @@
</span><span class="cx">
</span><span class="cx"> $style = '';
</span><span class="cx"> if ( $this->visibility ) {
</span><del>- $visibility_setting = $this->manager->get_setting( $this->visibility[0] );
- $visibility_value = isset( $this->visibility[1] ) ? $this->visibility[1] : true;
</del><ins>+ if ( is_string( $this->visibility ) ) {
+ $visibility_id = $this->visibility;
+ $visibility_value = true;
+ } else {
+ $visibility_id = $this->visibility[0];
+ $visibility_value = $this->visibility[1];
+ }
+ $visibility_setting = $this->manager->get_setting( $visibility_id );
</ins><span class="cx">
</span><span class="cx"> if ( $visibility_setting && $visibility_value != $visibility_setting->value() )
</span><span class="cx"> $style = 'style="display:none;"';
</span></span></pre></div>
<a id="trunkwpincludesclasswpcustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize.php (20262 => 20263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize.php 2012-03-22 07:58:24 UTC (rev 20262)
+++ trunk/wp-includes/class-wp-customize.php 2012-03-22 08:07:44 UTC (rev 20263)
</span><span class="lines">@@ -561,11 +561,51 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $this->add_setting( 'background_image', array(
</span><del>- 'label' => 'Background Image',
- 'section' => 'background',
- 'control' => 'upload',
</del><ins>+ 'label' => 'Background Image',
+ 'section' => 'background',
+ 'control' => 'upload',
+ 'default' => get_theme_support( 'custom-background', 'default-image' ),
</ins><span class="cx"> ) );
</span><span class="cx">
</span><ins>+ $this->add_setting( 'background_repeat', array(
+ 'label' => 'Background Repeat',
+ 'section' => 'background',
+ 'visibility' => 'background_image',
+ 'control' => 'radio',
+ 'choices' => array(
+ 'no-repeat' => __('No Repeat'),
+ 'repeat' => __('Tile'),
+ 'repeat-x' => __('Tile Horizontally'),
+ 'repeat-y' => __('Tile Vertically'),
+ ),
+ 'default' => 'repeat',
+ ) );
+
+ $this->add_setting( 'background_position_x', array(
+ 'label' => 'Background Position',
+ 'section' => 'background',
+ 'visibility' => 'background_image',
+ 'control' => 'radio',
+ 'choices' => array(
+ 'left' => __('Left'),
+ 'center' => __('Center'),
+ 'right' => __('Right'),
+ ),
+ 'default' => 'left',
+ ) );
+
+ $this->add_setting( 'background_attachment', array(
+ 'label' => 'Background Attachment',
+ 'section' => 'background',
+ 'visibility' => 'background_image',
+ 'control' => 'radio',
+ 'choices' => array(
+ 'fixed' => __('Fixed'),
+ 'scroll' => __('Scroll'),
+ ),
+ 'default' => 'fixed',
+ ) );
+
</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="trunkwpincludescustomizecontrolsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/customize-controls.php (20262 => 20263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/customize-controls.php 2012-03-22 07:58:24 UTC (rev 20262)
+++ trunk/wp-includes/customize-controls.php 2012-03-22 08:07:44 UTC (rev 20263)
</span><span class="lines">@@ -106,10 +106,18 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( $setting->visibility ) {
</span><del>- $settings['controls'][ $id ]['visibility'] = array(
- 'id' => $setting->visibility[0],
- 'value' => isset( $setting->visibility[1] ) ? $setting->visibility[1] : true,
- );
</del><ins>+ if ( is_string( $setting->visibility ) ) {
+ $settings['controls'][ $id ]['visibility'] = array(
+ 'id' => $setting->visibility,
+ 'value' => true,
+ );
+ } else {
+ $settings['controls'][ $id ]['visibility'] = array(
+ 'id' => $setting->visibility[0],
+ 'value' => $setting->visibility[1],
+ );
+ }
+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-controls.dev.js (20262 => 20263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-controls.dev.js 2012-03-22 07:58:24 UTC (rev 20262)
+++ trunk/wp-includes/js/customize-controls.dev.js 2012-03-22 08:07:44 UTC (rev 20263)
</span><span class="lines">@@ -245,9 +245,15 @@
</span><span class="cx">
</span><span class="cx"> if ( data.visibility ) {
</span><span class="cx"> api( data.visibility.id, function( other ) {
</span><del>- other.bind( function( to ) {
- control.container.toggle( to == data.visibility.value );
- });
</del><ins>+ if ( 'boolean' === typeof data.visibility.value ) {
+ other.bind( function( to ) {
+ control.container.toggle( !! to == data.visibility.value );
+ });
+ } else {
+ other.bind( function( to ) {
+ control.container.toggle( to == data.visibility.value );
+ });
+ }
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>