mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 09:37:42 +01:00
Customizer: Improve ColorControl
's wpColorPicker
to update UI based on setting changes.
Update Twenty Fifteen's `colorScheme` control to properly interact with the API, using `wp.customize.control()` instead of traversing DOM for other controls' container elements and stop manually updating color control UIs. props westonruter. fixes #30031. Built from https://develop.svn.wordpress.org/trunk@30126 git-svn-id: http://core.svn.wordpress.org/trunk@30126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
7eefc4d1e1
commit
461507452a
@ -869,6 +869,11 @@
|
||||
control.setting.set( false );
|
||||
}
|
||||
});
|
||||
|
||||
this.setting.bind( function ( value ) {
|
||||
picker.val( value );
|
||||
picker.wpColorPicker( 'color', value );
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
2
wp-admin/js/customize-controls.min.js
vendored
2
wp-admin/js/customize-controls.min.js
vendored
File diff suppressed because one or more lines are too long
@ -5,48 +5,38 @@
|
||||
* Adds listener to Color Scheme control to update other color controls with new values/defaults
|
||||
*/
|
||||
|
||||
( function( wp ) {
|
||||
wp.customize.controlConstructor.select = wp.customize.Control.extend( {
|
||||
( function( api ) {
|
||||
api.controlConstructor.select = api.Control.extend( {
|
||||
ready: function() {
|
||||
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' );
|
||||
|
||||
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] )
|
||||
// If Header Text is not hidden, update value.
|
||||
if ( 'blank' !== api( 'header_textcolor' ).get() ) {
|
||||
api( 'header_textcolor' ).set( colorScheme[value].colors[4] );
|
||||
api.control( 'header_textcolor' ).container.find( '.color-picker-hex' )
|
||||
.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] )
|
||||
// Update Background Color.
|
||||
api( 'background_color' ).set( colorScheme[value].colors[0] );
|
||||
api.control( 'background_color' ).container.find( '.color-picker-hex' )
|
||||
.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] )
|
||||
// Update Header/Sidebar Background Color.
|
||||
api( 'header_background_color' ).set( colorScheme[value].colors[1] );
|
||||
api.control( 'header_background_color' ).container.find( '.color-picker-hex' )
|
||||
.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] )
|
||||
// Update Sidebar Text Color.
|
||||
api( 'sidebar_textcolor' ).set( colorScheme[value].colors[4] );
|
||||
api.control( 'sidebar_textcolor' ).container.find( '.color-picker-hex' )
|
||||
.data( 'data-default-color', colorScheme[value].colors[4] )
|
||||
.wpColorPicker( 'color', colorScheme[value].colors[4] )
|
||||
.wpColorPicker( 'defaultColor', colorScheme[value].colors[4] );
|
||||
} );
|
||||
}
|
||||
}
|
||||
} );
|
||||
} )( this.wp );
|
||||
} )( wp.customize );
|
||||
|
@ -4,7 +4,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.1-alpha-30125';
|
||||
$wp_version = '4.1-alpha-30126';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
Loading…
Reference in New Issue
Block a user