<!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>[29944] trunk/src/wp-content/themes/twentyfifteen: Twenty Fifteen: Removing unused custom color controls.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/29944">29944</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/29944","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandstewart</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-17 20:51:46 +0000 (Fri, 17 Oct 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Fifteen: Removing unused custom color controls.
Props cainm, fixes <a href="https://core.trac.wordpress.org/ticket/29982">#29982</a> and <a href="https://core.trac.wordpress.org/ticket/29959">#29959</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninccustomizerphp">trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenjscolorschemecontroljs">trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfifteeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php 2014-10-17 20:37:07 UTC (rev 29943)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php 2014-10-17 20:51:46 UTC (rev 29944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,12 +27,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'twentyfifteen_sanitize_color_scheme',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize->add_control( new Twentyfifteen_Customize_Color_Scheme_Control( $wp_customize, 'color_scheme', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_customize->add_control( 'color_scheme', array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => esc_html__( 'Color Scheme', 'twentyfifteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => 'select',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'choices' => twentyfifteen_get_color_scheme_choices(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add custom sidebar text color setting and control.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting( 'sidebar_textcolor', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,46 +60,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'customize_register', 'twentyfifteen_customize_register', 11 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Custom control for Color Schemes
- *
- * @since Twenty Fifteen 1.0
- */
-function twentyfifteen_customize_color_scheme_control() {
- class Twentyfifteen_Customize_Color_Scheme_Control extends WP_Customize_Control {
- public $type = 'colorScheme';
-
- function enqueue() {
- wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls' ), '', true );
- wp_localize_script( 'color-scheme-control', 'colorScheme', twentyfifteen_get_color_schemes() );
- }
-
- public function render_content() {
- if ( empty( $this->choices ) )
- return;
-
- ?>
- <label>
- <?php if ( ! empty( $this->label ) ) : ?>
- <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
- <?php endif;
- if ( ! empty( $this->description ) ) : ?>
- <span class="description customize-control-description"><?php echo $this->description; ?></span>
- <?php endif; ?>
-
- <select <?php $this->link(); ?>>
- <?php
- foreach ( $this->choices as $value => $label )
- echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
- ?>
- </select>
- </label>
- <?php
- }
- }
-}
-add_action( 'customize_register', 'twentyfifteen_customize_color_scheme_control', 10 );
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Register color schemes for Twenty Fifteen.
</span><span class="cx" style="display: block; padding: 0 10px"> * Can be filtered with twentyfifteen_color_schemes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,6 +622,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', 'twentyfifteen_color_scheme_css' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Binds JS listener to make Customizer color_scheme control.
+ * Passes color scheme data as colorScheme global
+ *
+ * @since Twenty Fifteen 1.0
+ */
+function twentyfifteen_customize_control_js() {
+ wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls' ), '', true );
+ wp_localize_script( 'color-scheme-control', 'colorScheme', twentyfifteen_get_color_schemes() );
+}
+add_action( 'customize_controls_enqueue_scripts', 'twentyfifteen_customize_control_js' );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Binds JS handlers to make Customizer preview reload changes asynchronously.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteenjscolorschemecontroljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js 2014-10-17 20:37:07 UTC (rev 29943)
+++ trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js 2014-10-17 20:51:46 UTC (rev 29944)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,45 +6,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( wp ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.customize.controlConstructor.colorScheme = wp.customize.Control.extend( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.customize.controlConstructor.select = wp.customize.Control.extend( {
</ins><span class="cx" style="display: block; padding: 0 10px"> ready: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var parentSection = this.container.closest( '.control-section' ),
- headerTextColor = parentSection.find( '#customize-control-header_textcolor .color-picker-hex' ),
- backgroundColor = parentSection.find( '#customize-control-background_color .color-picker-hex' ),
- sidebarColor = parentSection.find( '#customize-control-header_background_color .color-picker-hex' ),
- sidebarTextColor = parentSection.find( '#customize-control-sidebar_textcolor .color-picker-hex' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'color_scheme' === this.id ) {
+ var parentSection = this.container.closest( '.control-section' ),
+ headerTextColor = parentSection.find( '#customize-control-header_textcolor .color-picker-hex' ),
+ backgroundColor = parentSection.find( '#customize-control-background_color .color-picker-hex' ),
+ sidebarColor = parentSection.find( '#customize-control-header_background_color .color-picker-hex' ),
+ sidebarTextColor = parentSection.find( '#customize-control-sidebar_textcolor .color-picker-hex' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.setting.bind( 'change', function( value ) {
- // if Header Text is not hidden, update value
- if ( 'blank' !== wp.customize( 'header_textcolor' ).get() ) {
- wp.customize( 'header_textcolor' ).set( colorScheme[value].colors[4] );
- headerTextColor.val( colorScheme[value].colors[4] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.setting.bind( 'change', function( value ) {
+ // if Header Text is not hidden, update value
+ if ( 'blank' !== wp.customize( 'header_textcolor' ).get() ) {
+ wp.customize( 'header_textcolor' ).set( colorScheme[value].colors[4] );
+ headerTextColor.val( colorScheme[value].colors[4] )
+ .data( 'data-default-color', colorScheme[value].colors[4] )
+ .wpColorPicker( 'color', colorScheme[value].colors[4] )
+ .wpColorPicker( 'defaultColor', colorScheme[value].colors[4] );
+ }
+
+ // update Background Color
+ wp.customize( 'background_color' ).set( colorScheme[value].colors[0] );
+ backgroundColor.val( colorScheme[value].colors[0] )
+ .data( 'data-default-color', colorScheme[value].colors[0] )
+ .wpColorPicker( 'color', colorScheme[value].colors[0] )
+ .wpColorPicker( 'defaultColor', colorScheme[value].colors[0] );
+
+ // update Header/Sidebar Background Color
+ wp.customize( 'header_background_color' ).set( colorScheme[value].colors[1] );
+ sidebarColor.val( colorScheme[value].colors[1] )
+ .data( 'data-default-color', colorScheme[value].colors[1] )
+ .wpColorPicker( 'color', colorScheme[value].colors[1] )
+ .wpColorPicker( 'defaultColor', colorScheme[value].colors[1] );
+
+ // update Sidebar Text Color
+ wp.customize( 'sidebar_textcolor' ).set( colorScheme[value].colors[4] );
+ sidebarTextColor.val( colorScheme[value].colors[4] )
</ins><span class="cx" style="display: block; padding: 0 10px"> .data( 'data-default-color', colorScheme[value].colors[4] )
</span><span class="cx" style="display: block; padding: 0 10px"> .wpColorPicker( 'color', colorScheme[value].colors[4] )
</span><span class="cx" style="display: block; padding: 0 10px"> .wpColorPicker( 'defaultColor', colorScheme[value].colors[4] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
-
- // update Background Color
- wp.customize( 'background_color' ).set( colorScheme[value].colors[0] );
- backgroundColor.val( colorScheme[value].colors[0] )
- .data( 'data-default-color', colorScheme[value].colors[0] )
- .wpColorPicker( 'color', colorScheme[value].colors[0] )
- .wpColorPicker( 'defaultColor', colorScheme[value].colors[0] );
-
- // update Header/Sidebar Background Color
- wp.customize( 'header_background_color' ).set( colorScheme[value].colors[1] );
- sidebarColor.val( colorScheme[value].colors[1] )
- .data( 'data-default-color', colorScheme[value].colors[1] )
- .wpColorPicker( 'color', colorScheme[value].colors[1] )
- .wpColorPicker( 'defaultColor', colorScheme[value].colors[1] );
-
- // update Sidebar Text Color
- wp.customize( 'sidebar_textcolor' ).set( colorScheme[value].colors[4] );
- sidebarTextColor.val( colorScheme[value].colors[4] )
- .data( 'data-default-color', colorScheme[value].colors[4] )
- .wpColorPicker( 'color', colorScheme[value].colors[4] )
- .wpColorPicker( 'defaultColor', colorScheme[value].colors[4] );
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } )( this.wp );
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>