<!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>[20123] trunk/wp-includes: Theme Customizer: First pass at using postMessage for background color.</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/20123">20123</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-03-06 02:49:02 +0000 (Tue, 06 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: First pass at using postMessage for background color. Fix instance where preview.targetWindow would become inaccurate. Initialize setting values in customize-preview.js. see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpcustomizephp">trunk/wp-includes/class-wp-customize.php</a></li>
<li><a href="#trunkwpincludesjscustomizebasedevjs">trunk/wp-includes/js/customize-base.dev.js</a></li>
<li><a href="#trunkwpincludesjscustomizecontrolsdevjs">trunk/wp-includes/js/customize-controls.dev.js</a></li>
<li><a href="#trunkwpincludesjscustomizepreviewdevjs">trunk/wp-includes/js/customize-preview.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpcustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize.php (20122 => 20123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize.php 2012-03-06 02:15:22 UTC (rev 20122)
+++ trunk/wp-includes/class-wp-customize.php 2012-03-06 02:49:02 UTC (rev 20123)
</span><span class="lines">@@ -122,7 +122,13 @@
</span><span class="cx"> $settings = array(
</span><span class="cx"> // @todo: Perhaps grab the URL via $_POST?
</span><span class="cx"> 'parent' => esc_url( admin_url( 'themes.php' ) ),
</span><ins>+ 'values' => array(),
</ins><span class="cx"> );
</span><ins>+
+ foreach ( $this->settings as $id => $setting ) {
+ $settings['values'][ $id ] = $setting->value();
+ }
+
</ins><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> (function() {
</span></span></pre></div>
<a id="trunkwpincludesjscustomizebasedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-base.dev.js (20122 => 20123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-base.dev.js 2012-03-06 02:15:22 UTC (rev 20122)
+++ trunk/wp-includes/js/customize-base.dev.js 2012-03-06 02:49:02 UTC (rev 20123)
</span><span class="lines">@@ -438,10 +438,11 @@
</span><span class="cx"> api.Messenger = api.Class.extend({
</span><span class="cx"> add: api.ValueFactory(),
</span><span class="cx">
</span><del>- initialize: function( url, options ) {
</del><ins>+ initialize: function( url, targetWindow, options ) {
</ins><span class="cx"> $.extend( this, options || {} );
</span><span class="cx">
</span><span class="cx"> this.add( 'url', url );
</span><ins>+ this.add( 'targetWindow', targetWindow || null );
</ins><span class="cx"> this.add( 'origin' ).link( 'url', function( url ) {
</span><span class="cx"> return url().replace( /([^:]+:\/\/[^\/]+).*/, '$1' );
</span><span class="cx"> });
</span><span class="lines">@@ -453,8 +454,6 @@
</span><span class="cx"> receive: function( event ) {
</span><span class="cx"> var message;
</span><span class="cx">
</span><del>- console.log( 'messenger receiveMessage', arguments );
-
</del><span class="cx"> // @todo: remove, this is done in the postMessage plugin.
</span><span class="cx"> // if ( this.origin && event.origin !== this.origin )
</span><span class="cx"> // return;
</span><span class="lines">@@ -470,9 +469,8 @@
</span><span class="cx"> if ( ! this.url() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- console.log( 'sending message', id, data );
</del><span class="cx"> message = JSON.stringify({ id: id, data: data });
</span><del>- $.postMessage( message, this.url(), this.targetWindow || null );
</del><ins>+ $.postMessage( message, this.url(), this.targetWindow() );
</ins><span class="cx"> },
</span><span class="cx"> bind: function( id, callback ) {
</span><span class="cx"> var topic = this.topics[ id ] || ( this.topics[ id ] = $.Callbacks() );
</span></span></pre></div>
<a id="trunkwpincludesjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-controls.dev.js (20122 => 20123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-controls.dev.js 2012-03-06 02:15:22 UTC (rev 20122)
+++ trunk/wp-includes/js/customize-controls.dev.js 2012-03-06 02:49:02 UTC (rev 20123)
</span><span class="lines">@@ -59,9 +59,7 @@
</span><span class="cx">
</span><span class="cx"> this.container = this.iframe.parent();
</span><span class="cx">
</span><del>- api.Messenger.prototype.initialize.call( this, params.url, {
- targetWindow: this.iframe[0].contentWindow
- });
</del><ins>+ api.Messenger.prototype.initialize.call( this, params.url, this.iframe[0].contentWindow );
</ins><span class="cx">
</span><span class="cx"> this._formOriginalProps = {
</span><span class="cx"> target: this.form.prop('target'),
</span><span class="lines">@@ -100,6 +98,7 @@
</span><span class="cx"> this.iframe = this.loading;
</span><span class="cx"> delete this.loading;
</span><span class="cx"> this.iframe.prop( 'name', this.name );
</span><ins>+ this.targetWindow( this.iframe[0].contentWindow );
</ins><span class="cx"> },
</span><span class="cx"> refresh: function() {
</span><span class="cx"> this.loader().one( 'load', this.loaded );
</span><span class="lines">@@ -127,7 +126,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var controls = $('[name^="' + api.settings.prefix + '"]'),
</span><del>- previewer, pickers, validateColor;
</del><ins>+ previewer, pickers, validateColor, sendSetting;
</ins><span class="cx">
</span><span class="cx"> // Initialize Previewer
</span><span class="cx"> previewer = new api.Previewer({
</span><span class="lines">@@ -146,6 +145,8 @@
</span><span class="cx"> setting.link( setting.control );
</span><span class="cx">
</span><span class="cx"> setting.bind( previewer.refresh );
</span><ins>+
+
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Temporary accordion code.
</span><span class="lines">@@ -196,9 +197,9 @@
</span><span class="cx"> $(this).siblings('div').toggle();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // Fetch prefixed settings.
- $('[name^="' + api.settings.prefix + '"]').each( function() {
- // console.log( this.name );
</del><ins>+ // Background color uses postMessage by default
+ api('background_color').unbind( previewer.refresh ).bind( function() {
+ previewer.send( 'setting', [ 'background_color', this() ] );
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjscustomizepreviewdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-preview.dev.js (20122 => 20123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-preview.dev.js 2012-03-06 02:15:22 UTC (rev 20122)
+++ trunk/wp-includes/js/customize-preview.dev.js 2012-03-06 02:49:02 UTC (rev 20123)
</span><span class="lines">@@ -51,9 +51,26 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> $( function() {
</span><del>- var preview;
</del><ins>+ if ( ! api.settings )
+ return;
</ins><span class="cx">
</span><ins>+ var preview, body;
+
</ins><span class="cx"> preview = new api.Preview( api.settings.parent );
</span><ins>+
+ $.each( api.settings.values, function( id, value ) {
+ api.set( id, value );
+ });
+
+ preview.bind( 'setting', function( args ) {
+ api.set.apply( api, args );
+ });
+
+ body = $(document.body);
+ // Auto update background color by default
+ api.bind( 'background_color', function( to ) {
+ body.css( 'background-color', '#' + to );
+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> })( wp, jQuery );
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>