<!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>[21004] trunk/wp-admin/js/custom-background.dev.js: Custom background color: Show the 'Default' link when the input is empty and there is a default color registered.</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/21004">21004</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-06-05 18:57:49 +0000 (Tue, 05 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Custom background color: Show the 'Default' link when the input is empty and there is a default color registered. fixes <a href="http://core.trac.wordpress.org/ticket/20448">#20448</a>. see <a href="http://core.trac.wordpress.org/ticket/20734">#20734</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjscustombackgrounddevjs">trunk/wp-admin/js/custom-background.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjscustombackgrounddevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-background.dev.js (21003 => 21004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-background.dev.js 2012-06-05 18:51:33 UTC (rev 21003)
+++ trunk/wp-admin/js/custom-background.dev.js 2012-06-05 18:57:49 UTC (rev 21004)
</span><span class="lines">@@ -2,14 +2,15 @@
</span><span class="cx">
</span><span class="cx"> (function($) {
</span><span class="cx">
</span><del>- pickColor = function(color, cleared) {
</del><ins>+ var defaultColor = '';
+
+ pickColor = function(color) {
</ins><span class="cx"> farbtastic.setColor(color);
</span><span class="cx"> $('#background-color').val(color);
</span><span class="cx"> $('#custom-background-image').css('background-color', color);
</span><del>- console.log( color );
- if ( typeof cleared === 'undefined' )
- cleared = ! color || color === '#';
- if ( cleared )
</del><ins>+ // If we have a default color, and they match, then we need to hide the 'Default' link.
+ // Otherwise, we hide the 'Clear' link when it is empty.
+ if ( ( defaultColor && color === defaultColor ) || ( ! defaultColor && ( '' === color || '#' === color ) ) )
</ins><span class="cx"> $('#clearcolor').hide();
</span><span class="cx"> else
</span><span class="cx"> $('#clearcolor').show();
</span><span class="lines">@@ -17,13 +18,15 @@
</span><span class="cx">
</span><span class="cx"> $(document).ready(function() {
</span><span class="cx">
</span><ins>+ defaultColor = $('#defaultcolor').val();
+
</ins><span class="cx"> $('#pickcolor').click(function() {
</span><span class="cx"> $('#colorPickerDiv').show();
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> $('#clearcolor a').click( function(e) {
</span><del>- pickColor( $('#defaultcolor').val(), true );
</del><ins>+ pickColor( defaultColor );
</ins><span class="cx"> e.preventDefault();
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>