From 8ceefdcdeb6006566ffa3fee5017520a2580c377 Mon Sep 17 00:00:00 2001
From: Takashi Irie <takashi@automattic.com>
Date: Mon, 22 Apr 2013 16:47:14 +0100
Subject: [PATCH] Fixes the broken display header text option in the
 Customizer.

---
 inc/custom-header.php |  9 ++-------
 inc/customizer.php    |  2 +-
 js/customizer.js      | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/inc/custom-header.php b/inc/custom-header.php
index 22a587ab..71215795 100644
--- a/inc/custom-header.php
+++ b/inc/custom-header.php
@@ -105,7 +105,7 @@ function _s_header_style() {
 	?>
 		.site-title,
 		.site-description {
-			position: absolute !important;
+			position: absolute;
 			clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
 			clip: rect(1px, 1px, 1px, 1px);
 		}
@@ -159,12 +159,7 @@ if ( ! function_exists( '_s_admin_header_image' ) ) :
  */
 function _s_admin_header_image() { ?>
 	<div id="headimg">
-		<?php
-		if ( 'blank' == get_header_textcolor() || '' == get_header_textcolor() )
-			$style = ' style="display:none;"';
-		else
-			$style = ' style="color:#' . get_header_textcolor() . ';"';
-		?>
+		<?php $style = ' style="color:#' . get_header_textcolor() . ';"'; ?>
 		<h1 class="displaying-header-text"><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
 		<div class="displaying-header-text" id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
 		<?php $header_image = get_header_image();
diff --git a/inc/customizer.php b/inc/customizer.php
index 54fe6908..f821f8ba 100644
--- a/inc/customizer.php
+++ b/inc/customizer.php
@@ -21,6 +21,6 @@ add_action( 'customize_register', '_s_customize_register' );
  * Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
  */
 function _s_customize_preview_js() {
-	wp_enqueue_script( '_s_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20130304', true );
+	wp_enqueue_script( '_s_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20130422', true );
 }
 add_action( 'customize_preview_init', '_s_customize_preview_js' );
diff --git a/js/customizer.js b/js/customizer.js
index 68f76ec3..888c1d48 100644
--- a/js/customizer.js
+++ b/js/customizer.js
@@ -8,7 +8,7 @@
 	// Site title and description.
 	wp.customize( 'blogname', function( value ) {
 		value.bind( function( to ) {
-			$( '.site-title a' ).text( to );
+			$( '.site-title' ).text( to );
 		} );
 	} );
 	wp.customize( 'blogdescription', function( value ) {
@@ -19,7 +19,18 @@
 	// Header text color.
 	wp.customize( 'header_textcolor', function( value ) {
 		value.bind( function( to ) {
-			$( '.site-title a, .site-description' ).css( 'color', to );
+			if ( 'blank' == to ) {
+				$( '.site-title, .site-description' ).css( {
+					'clip': 'rect(1px, 1px, 1px, 1px)',
+					'position': 'absolute'
+				} );
+			} else {
+				$( '.site-title, .site-description' ).css( {
+					'clip': 'auto',
+					'color': to,
+					'position': 'relative'
+				} );
+			}
 		} );
 	} );
 } )( jQuery );
\ No newline at end of file