Ticket #30031: 30031.diff

src/wp-admin/js/customize-controls.js

@@ -170 +170 @@
                                         control.setting.set( false );
                                 }
                         });
+
+                        this.setting.bind( function ( value ) {
+                                picker.val( value );
+                                picker.wpColorPicker( 'color', value );
+                        });
                 }
         });
 

src/wp-content/themes/twentyfifteen/js/color-scheme-control.js

@@ -5 +5 @@
  * Adds listener to Color Scheme control to update other color controls with new values/defaults
  */
 
-( function( wp ) {
-        wp.customize.controlConstructor.colorScheme = wp.customize.Control.extend( {
+( function( customize ) {
+        customize.controlConstructor.colorScheme = customize.Control.extend( {
                 ready: function() {
-                        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 ( 'blank' !== customize( 'header_textcolor' ).get() ) {
+                                        customize( 'header_textcolor' ).set( colorScheme[value].colors[4] );
+                                        customize.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] )
+                                customize( 'background_color' ).set( colorScheme[value].colors[0] );
+                                customize.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] )
+                                customize( 'header_background_color' ).set( colorScheme[value].colors[1] );
+                                customize.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] )
+                                customize( 'sidebar_textcolor' ).set( colorScheme[value].colors[4] );
+                                customize.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 );
- No newline at end of file
+} )( this.wp.customize );