<!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>[21411] trunk/wp-content/themes/twentytwelve: Twenty Twelve: Add postMessage support in Customizer for fonts, site title and description, and background color body_class value updates.</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/21411">21411</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-08-02 22:10:03 +0000 (Thu, 02 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: Add postMessage support in Customizer for fonts, site title and description, and background color body_class value updates.
Props obenland for first patch and testing. Fixes <a href="http://core.trac.wordpress.org/ticket/21443">#21443</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelveincthemeoptionsphp">trunk/wp-content/themes/twentytwelve/inc/theme-options.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvejsthemecustomizerjs">trunk/wp-content/themes/twentytwelve/js/theme-customizer.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (21410 => 21411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2012-08-02 21:11:11 UTC (rev 21410)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2012-08-02 22:10:03 UTC (rev 21411)
</span><span class="lines">@@ -111,10 +111,8 @@
</span><span class="cx"> * Depends on Theme Options setting.
</span><span class="cx"> */
</span><span class="cx"> $options = $twentytwelve_options->get_theme_options();
</span><del>- if ( $options['enable_fonts'] ) {
- $protocol = is_ssl() ? 'https' : 'http';
- wp_enqueue_style( 'twentytwelve-fonts', "$protocol://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" );
- }
</del><ins>+ if ( $options['enable_fonts'] )
+ wp_enqueue_style( 'twentytwelve-fonts', $twentytwelve_options->custom_fonts_url() );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Load our main CSS file.
</span><span class="lines">@@ -373,15 +371,4 @@
</span><span class="cx"> $content_width = 960;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'template_redirect', 'twentytwelve_content_width' );
-
-/**
- * Bind JS handler to make Theme Customizer preview reload
- * custom background `body_class` value changes asynchronously.
- *
- * @since Twenty Twelve 1.0
- */
-function twentytwelve_customize_preview_js() {
- wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20120725', true );
-}
-add_action( 'customize_preview_init', 'twentytwelve_customize_preview_js' );
</del><span class="cx">\ No newline at end of file
</span><ins>+add_action( 'template_redirect', 'twentytwelve_content_width' );
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelveincthemeoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/inc/theme-options.php (21410 => 21411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/inc/theme-options.php 2012-08-02 21:11:11 UTC (rev 21410)
+++ trunk/wp-content/themes/twentytwelve/inc/theme-options.php 2012-08-02 22:10:03 UTC (rev 21411)
</span><span class="lines">@@ -37,9 +37,10 @@
</span><span class="cx"> if ( 'twentytwelve' != get_stylesheet() )
</span><span class="cx"> $this->option_key = get_stylesheet() . '_theme_options';
</span><span class="cx">
</span><del>- add_action( 'admin_init', array( $this, 'options_init' ) );
- add_action( 'admin_menu', array( $this, 'add_page' ) );
- add_action( 'customize_register', array( $this, 'customize_register' ) );
</del><ins>+ add_action( 'admin_init', array( $this, 'options_init' ) );
+ add_action( 'admin_menu', array( $this, 'add_page' ) );
+ add_action( 'customize_register', array( $this, 'customize_register' ) );
+ add_action( 'customize_preview_init', array( $this, 'customize_preview_js' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -203,6 +204,11 @@
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="cx"> public function customize_register( $wp_customize ) {
</span><ins>+
+ // Add postMessage support for site title and tagline
+ $wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
+ $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
+
</ins><span class="cx"> // Enable Web Fonts
</span><span class="cx"> $wp_customize->add_section( $this->option_key . '_enable_fonts', array(
</span><span class="cx"> 'title' => __( 'Fonts', 'twentytwelve' ),
</span><span class="lines">@@ -215,6 +221,7 @@
</span><span class="cx"> 'default' => $defaults['enable_fonts'],
</span><span class="cx"> 'type' => 'option',
</span><span class="cx"> 'capability' => 'edit_theme_options',
</span><ins>+ 'transport' => 'postMessage',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $wp_customize->add_control( $this->option_key . '_enable_fonts', array(
</span><span class="lines">@@ -224,4 +231,33 @@
</span><span class="cx"> 'type' => 'checkbox',
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Bind JS handlers to make Theme Customizer preview reload changes asynchronously.
+ *
+ * @since Twenty Twelve 1.0
+ * @access public
+ *
+ * @return void
+ */
+ public function customize_preview_js() {
+ wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20120725', true );
+ wp_localize_script( 'twentytwelve-customizer', 'twentytwelve_customizer', array(
+ 'option_key' => $this->option_key,
+ 'link' => $this->custom_fonts_url(),
+ ) );
+ }
+
+ /**
+ * Create path to load fonts CSS file with correct protocol.
+ *
+ * @since Twenty Twelve 1.0
+ * @access public
+ *
+ * @return string Path to load fonts CSS.
+ */
+ public function custom_fonts_url() {
+ $protocol = is_ssl() ? 'https' : 'http';
+ return $protocol . '://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700';
+ }
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvejsthemecustomizerjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/js/theme-customizer.js (21410 => 21411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/js/theme-customizer.js 2012-08-02 21:11:11 UTC (rev 21410)
+++ trunk/wp-content/themes/twentytwelve/js/theme-customizer.js 2012-08-02 22:10:03 UTC (rev 21411)
</span><span class="lines">@@ -1,4 +1,36 @@
</span><del>-( function( $ ){
</del><ins>+/**
+ * Theme Customizer enhancements for a better user experience.
+ *
+ * Contains handlers to make Theme Customizer preview reload changes asynchronously.
+ * Things like fonts, site title and description, and background color changes.
+ *
+ * See related settings in Twenty_Twelve_Options::customize_preview_js()
+ */
+
+( function( $ ) {
+ // Site title and description.
+ wp.customize( 'blogname', function( value ) {
+ value.bind( function( to ) {
+ $( '.site-title a' ).html( to );
+ } );
+ } );
+ wp.customize( 'blogdescription', function( value ) {
+ value.bind( function( to ) {
+ $( '.site-description' ).html( to );
+ } );
+ } );
+
+ // Custom fonts.
+ wp.customize( twentytwelve_customizer.option_key + '[enable_fonts]', function( value ) {
+ value.bind( function( to ) {
+ if ( to ) {
+ $( 'head' ).append( '<link rel="stylesheet" id="twentytwelve-fonts-css" href="' + twentytwelve_customizer.link + '" type="text/css" media="all" />' );
+ } else {
+ $( '#twentytwelve-fonts-css' ).remove();
+ }
+ } );
+ } );
+
</ins><span class="cx"> // Hook into background color change and adjust body class value as needed.
</span><span class="cx"> wp.customize( 'background_color', function( value ) {
</span><span class="cx"> var body = $( 'body' );
</span></span></pre>
</div>
</div>
</body>
</html>