Fix getColor() in wp-lists.js

git-svn-id: https://develop.svn.wordpress.org/trunk@17780 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2011-04-30 16:57:20 +00:00
parent dc7228f7b0
commit b9874e63dc
3 changed files with 4 additions and 11 deletions

View File

@ -242,16 +242,9 @@ wpList = {
return false; return false;
}, },
// From jquery.color.js: jQuery Color Animation by John Resig
getColor: function( el ) { getColor: function( el ) {
if ( el.constructor == Object ) var color = jQuery(el).css('backgroundColor');
el = el.get(0);
var elem = el, color, rgbaTrans = new RegExp( "rgba\\(\\s*0,\\s*0,\\s*0,\\s*0\\s*\\)", "i" );
do {
color = jQuery.curCSS(elem, 'backgroundColor');
if ( color != '' && color != 'transparent' && !color.match(rgbaTrans) || jQuery.nodeName(elem, "body") )
break;
} while ( elem = elem.parentNode );
return color || '#ffffff'; return color || '#ffffff';
}, },

File diff suppressed because one or more lines are too long

View File

@ -110,7 +110,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20110425' ); $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20110425' );
$scripts->add_data( 'autosave', 'group', 1 ); $scripts->add_data( 'autosave', 'group', 1 );
$scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response'), '20110429' ); $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response'), '20110430' );
$scripts->add_data( 'wp-lists', 'group', 1 ); $scripts->add_data( 'wp-lists', 'group', 1 );
$scripts->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.8.3'); $scripts->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.8.3');