<!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>[20120] trunk/wp-includes: Theme Customizer: Add working color pickers.</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/20120">20120</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-03-06 02:03:50 +0000 (Tue, 06 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Add working color pickers. First pass. 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="#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 (20119 => 20120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-setting.php 2012-03-06 01:59:50 UTC (rev 20119)
+++ trunk/wp-includes/class-wp-customize-setting.php 2012-03-06 02:03:50 UTC (rev 20120)
</span><span class="lines">@@ -340,10 +340,17 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'color':
</span><span class="cx"> ?>
</span><del>- <label><?php echo esc_html( $this->label ); ?><br/>
- <span class="hex-prepend">#</span>
- <input type="text" class="hex-input" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->name(); ?> />
- <a href="#" class="pickcolor hex-color-example"></a>
</del><ins>+ <label>
+ <span><?php echo esc_html( $this->label ); ?></span>
+ <div class="color-picker">
+ <input class="color-picker-value" type="hidden" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->name(); ?> />
+ <a href="#"></a>
+ <div class="color-picker-controls">
+ <div class="farbtastic-placeholder"></div>
+ <span>#</span>
+ <input type="text" />
+ </div>
+ </div>
</ins><span class="cx"> </label>
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpincludescsscustomizecontrolsdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/customize-controls.dev.css (20119 => 20120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/customize-controls.dev.css 2012-03-06 01:59:50 UTC (rev 20119)
+++ trunk/wp-includes/css/customize-controls.dev.css 2012-03-06 02:03:50 UTC (rev 20120)
</span><span class="lines">@@ -226,7 +226,29 @@
</span><span class="cx"> max-width: 150px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .hex-prepend {
</del><ins>+/*
+ * Color Picker
+ */
+
+.customize-section .color-picker {
+ margin-top: 4px;
+}
+
+.customize-section .color-picker a {
+ display: block;
+ height: 20px;
+ width: 40px;
+ border: solid 3px rgba( 0, 0, 0, 0.1 );
+ background-color: #fff;
+
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+}
+
+.customize-section .color-picker .color-picker-controls {
+ display: none;
+}
+.customize-section .color-picker span {
</ins><span class="cx"> float: left;
</span><span class="cx"> display: block;
</span><span class="cx"> margin: 1px -2px 0 0;
</span><span class="lines">@@ -240,16 +262,8 @@
</span><span class="cx"> border-radius: 3px 0 0 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section input[type="text"].hex-input {
</del><ins>+.customize-section .color-picker input[type="text"] {
</ins><span class="cx"> -webkit-border-radius: 0 3px 3px 0;
</span><span class="cx"> border-radius: 0 3px 3px 0;
</span><span class="cx"> width: 150px;
</span><span class="cx"> }
</span><del>-
-.customize-section .hex-color-example {
- border: 1px solid #dfdfdf;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- padding: 3px 14px;
- background-color: #ef45da
-}
</del></span></pre></div>
<a id="trunkwpincludesjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-controls.dev.js (20119 => 20120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-controls.dev.js 2012-03-06 01:59:50 UTC (rev 20119)
+++ trunk/wp-includes/js/customize-controls.dev.js 2012-03-06 02:03:50 UTC (rev 20120)
</span><span class="lines">@@ -126,8 +126,8 @@
</span><span class="cx"> if ( ! api.settings )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var previewer,
- controls = $('[name^="' + api.settings.prefix + '"]');
</del><ins>+ var controls = $('[name^="' + api.settings.prefix + '"]'),
+ previewer, pickers, validateColor;
</ins><span class="cx">
</span><span class="cx"> // Initialize Previewer
</span><span class="cx"> previewer = new api.Previewer({
</span><span class="lines">@@ -160,6 +160,39 @@
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ // Set up color pickers
+ pickers = $('.color-picker');
+ validateColor = function( to ) {
+ return /^[a-fA-F0-9]{3}([a-fA-F0-9]{3})?$/.test( to ) ? to : null;
+ };
+
+ $( '.farbtastic-placeholder', pickers ).each( function() {
+ var picker = $(this),
+ text = new api.Element( picker.siblings('input') ),
+ parent = picker.parent(),
+ toggle = parent.siblings('a'),
+ value = api( parent.siblings('input').prop('name').replace( api.settings.prefix, '' ) ),
+ farb;
+
+ value.validate = validateColor;
+ text.link( value );
+ value.link( text );
+
+ farb = $.farbtastic( this, function( color ) {
+ value.set( color.replace( '#', '' ) );
+ });
+
+ value.bind( function( color ) {
+ color = '#' + color;
+ toggle.css( 'background', color );
+ farb.setColor( color );
+ });
+ });
+
+ $('.color-picker a').click( function(e) {
+ $(this).siblings('div').toggle();
+ });
+
</ins><span class="cx"> // Fetch prefixed settings.
</span><span class="cx"> $('[name^="' + api.settings.prefix + '"]').each( function() {
</span><span class="cx"> // console.log( this.name );
</span></span></pre>
</div>
</div>
</body>
</html>