WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Twenty Fifteen: cleaning up JS introduced in r30305 that doesn't pass jshint. 

Props boonebgorges, fixes #29988.


Built from https://develop.svn.wordpress.org/trunk@30325


git-svn-id: http://core.svn.wordpress.org/trunk@30324 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ian Stewart 2014-11-13 03:18:23 +00:00
parent 3f967c8f1a
commit 3acf55cf96
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-content/themes/twentyfifteen/js/color-scheme-control.js
View File

@ -1,4 +1,4 @@
/* global colorScheme */ /* global colorScheme, Color */
/** /**
* Add a listener to the Color Scheme control to update other color controls to new values/defaults. * Add a listener to the Color Scheme control to update other color controls to new values/defaults.
* Also trigger an update of the Color Scheme CSS when a color is changed. * Also trigger an update of the Color Scheme CSS when a color is changed.
@ -57,12 +57,12 @@
}); });
// Add additional colors. // Add additional colors.
colors['secondary_textcolor'] = Color( colors.textcolor ).toCSS( 'rgba', 0.7 ); colors.secondary_textcolor = Color( colors.textcolor ).toCSS( 'rgba', 0.7 );
colors['border_color'] = Color( colors.textcolor ).toCSS( 'rgba', 0.1 ); colors.border_color = Color( colors.textcolor ).toCSS( 'rgba', 0.1 );
colors['border_focus_color'] = Color( colors.textcolor ).toCSS( 'rgba', 0.3 ); colors.border_focus_color = Color( colors.textcolor ).toCSS( 'rgba', 0.3 );
colors['secondary_sidebar_textcolor'] = Color( colors.sidebar_textcolor ).toCSS( 'rgba', 0.7 ); colors.secondary_sidebar_textcolor = Color( colors.sidebar_textcolor ).toCSS( 'rgba', 0.7 );
colors['sidebar_border_color'] = Color( colors.sidebar_textcolor ).toCSS( 'rgba', 0.1 ); colors.sidebar_border_color = Color( colors.sidebar_textcolor ).toCSS( 'rgba', 0.1 );
colors['sidebar_border_focus_color'] = Color( colors.sidebar_textcolor ).toCSS( 'rgba', 0.3 ); colors.sidebar_border_focus_color = Color( colors.sidebar_textcolor ).toCSS( 'rgba', 0.3 );
return cssTemplate( colors ); return cssTemplate( colors );
} }
@ -70,7 +70,7 @@
// Update the CSS whenever a color setting is changed. // Update the CSS whenever a color setting is changed.
_.each( colorSettings, function( setting ) { _.each( colorSettings, function( setting ) {
api( setting, function( setting ) { api( setting, function( setting ) {
setting.bind( _.throttle( function( value ) { setting.bind( _.throttle( function() {
api( 'color_scheme_css' ).set( getCSS() ); api( 'color_scheme_css' ).set( getCSS() );
}, 250 ) ); }, 250 ) );
} ); } );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-alpha-30324'; $wp_version = '4.1-alpha-30325';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.