<!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>[20278] trunk/wp-includes: Theme Customizer: First pass at image controls.</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/20278">20278</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-03-24 04:35:13 +0000 (Sat, 24 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: First pass at image controls. Use header_image as the initial case. Add a 'removed' control param for upload/image controls to map 'removed' to a value other than the empty string. 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="#trunkwpincludescsscustomizecontrolsdevcss">trunk/wp-includes/css/customize-controls.dev.css</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 (20277 => 20278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-setting.php 2012-03-24 01:58:28 UTC (rev 20277)
+++ trunk/wp-includes/class-wp-customize-setting.php 2012-03-24 04:35:13 UTC (rev 20278)
</span><span class="lines">@@ -405,19 +405,44 @@
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx"> case 'upload':
</span><del>- $value = $this->value();
- $style = empty( $value ) ? 'style="display:none;"' : '';
</del><span class="cx"> ?>
</span><span class="cx"> <label>
</span><span class="cx"> <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
</span><span class="cx"> <div>
</span><span class="cx"> <input type="hidden" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->name(); ?> />
</span><span class="cx"> <a href="#" class="button-secondary upload"><?php _e( 'Upload' ); ?></a>
</span><del>- <a href="#" class="remove" <?php echo $style; ?>><?php _e( 'Remove' ); ?></a>
</del><ins>+ <a href="#" class="remove"><?php _e( 'Remove' ); ?></a>
</ins><span class="cx"> </div>
</span><span class="cx"> </label>
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span><ins>+ case 'image':
+ $value = $this->value();
+
+ $image = $value;
+ if ( isset( $this->control_params['get_url'] ) )
+ $image = call_user_func( $this->control_params['get_url'], $image );
+
+ ?>
+ <label>
+ <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+ <input type="hidden" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->name(); ?> />
+ <div class="customize-image-picker">
+ <div class="thumbnail">
+ <?php if ( empty( $image ) ): ?>
+ <img style="display:none;" />
+ <?php else: ?>
+ <img src="<?php echo esc_url( $image ); ?>" />
+ <?php endif; ?>
+ </div>
+ <div class="actions">
+ <a href="#" class="upload"><?php _e( 'Upload New' ); ?></a>
+ <a href="#" class="remove"><?php _e( 'Remove Image' ); ?></a>
+ </div>
+ </div>
+ </label>
+ <?php
+ break;
</ins><span class="cx"> case 'dropdown-pages':
</span><span class="cx"> printf(
</span><span class="cx"> '<label class="customize-control-select"><span class="customize-control-title">%s</span> %s</label>',
</span></span></pre></div>
<a id="trunkwpincludesclasswpcustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize.php (20277 => 20278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize.php 2012-03-24 01:58:28 UTC (rev 20277)
+++ trunk/wp-includes/class-wp-customize.php 2012-03-24 04:35:13 UTC (rev 20278)
</span><span class="lines">@@ -536,10 +536,12 @@
</span><span class="cx"> $this->add_setting( 'header_image', array(
</span><span class="cx"> 'label' => 'Header Image',
</span><span class="cx"> 'section' => 'header',
</span><del>- 'control' => 'upload',
</del><ins>+ 'control' => 'image',
</ins><span class="cx"> 'default' => get_theme_support( 'custom-header', 'default-image' ),
</span><span class="cx"> 'control_params' => array(
</span><span class="cx"> 'context' => 'custom-header',
</span><ins>+ 'removed' => 'remove-header',
+ 'get_url' => 'get_header_image',
</ins><span class="cx"> ),
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescsscustomizecontrolsdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/customize-controls.dev.css (20277 => 20278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/customize-controls.dev.css 2012-03-24 01:58:28 UTC (rev 20277)
+++ trunk/wp-includes/css/customize-controls.dev.css 2012-03-24 04:35:13 UTC (rev 20278)
</span><span class="lines">@@ -302,3 +302,29 @@
</span><span class="cx"> border: 0;
</span><span class="cx"> background: transparent;
</span><span class="cx"> }
</span><ins>+
+/*
+ * Image Picker
+ */
+.customize-section .customize-image-picker {
+ float: left;
+}
+.customize-section .customize-image-picker .thumbnail {
+ float: left;
+ clear: left;
+ width: 100px;
+ margin-right: 20px;
+ min-height: 1em;
+}
+.customize-section .customize-image-picker .thumbnail img {
+ max-width: 98px;
+ max-height: 98px;
+ border: 1px solid #ccc;
+}
+.customize-section .customize-image-picker .actions {
+ width: 140px;
+ float: left;
+}
+.customize-section .customize-image-picker .actions a {
+ display: block;
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-controls.dev.js (20277 => 20278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-controls.dev.js 2012-03-24 01:58:28 UTC (rev 20277)
+++ trunk/wp-includes/js/customize-controls.dev.js 2012-03-24 04:35:13 UTC (rev 20278)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> var control = this;
</span><span class="cx">
</span><span class="cx"> api.Control.prototype.initialize.call( this, id, value, options );
</span><ins>+ this.params.removed = this.params.removed || '';
</ins><span class="cx">
</span><span class="cx"> this.uploader = new wp.Uploader({
</span><span class="cx"> browser: this.container.find('.upload'),
</span><span class="lines">@@ -86,20 +87,36 @@
</span><span class="cx">
</span><span class="cx"> this.remover = this.container.find('.remove');
</span><span class="cx"> this.remover.click( function( event ) {
</span><del>- control.set('');
</del><ins>+ control.set( control.params.removed );
</ins><span class="cx"> event.preventDefault();
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.bind( this.removerVisibility );
</span><ins>+ this.removerVisibility( this.get() );
</ins><span class="cx">
</span><span class="cx"> if ( this.params.context )
</span><span class="cx"> control.uploader.param( 'post_data[context]', this.params.context );
</span><span class="cx"> },
</span><del>- removerVisibility: function( on ) {
- this.remover.toggle( !! on );
</del><ins>+ removerVisibility: function( to ) {
+ this.remover.toggle( to != this.params.removed );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ api.ImageControl = api.UploadControl.extend({
+ initialize: function( id, value, options ) {
+ api.UploadControl.prototype.initialize.call( this, id, value, options );
+
+ this.thumbnail = this.container.find('.thumbnail img');
+ this.bind( this.thumbnailSrc );
+ },
+ thumbnailSrc: function( to ) {
+ if ( /^(http:\/\/|https:\/\/|\/\/)/.test( to ) )
+ this.thumbnail.prop( 'src', to ).show();
+ else
+ this.thumbnail.hide();
+ }
+ });
+
</ins><span class="cx"> // Change objects contained within the main customize object to Settings.
</span><span class="cx"> api.defaultConstructor = api.Setting;
</span><span class="cx">
</span><span class="lines">@@ -225,7 +242,8 @@
</span><span class="cx">
</span><span class="cx"> api.controls = {
</span><span class="cx"> color: api.ColorControl,
</span><del>- upload: api.UploadControl
</del><ins>+ upload: api.UploadControl,
+ image: api.ImageControl
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> $( function() {
</span></span></pre>
</div>
</div>
</body>
</html>