Index: wp-includes/class-wp-customize-control.php
===================================================================
--- wp-includes/class-wp-customize-control.php (revision 21626)
+++ wp-includes/class-wp-customize-control.php (working copy)
@@ -351,8 +351,8 @@
* @since 3.4.0
*/
public function enqueue() {
- wp_enqueue_script( 'farbtastic' );
- wp_enqueue_style( 'farbtastic' );
+ wp_enqueue_script( 'wp-color-picker' );
+ wp_enqueue_style( 'wp-color-picker' );
}
/**
@@ -372,19 +372,15 @@
* @since 3.4.0
*/
public function render_content() {
+ $this_default = $this->setting->default;
+ if ( strpos( $this_default, '#' ) === false )
+ $this_default = '#' . $this_default;
?>
add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
+ $iris_deps = array( 'jquery-ui-draggable', 'jquery-ui-slider' );
+ if ( wp_is_mobile() )
+ $iris_deps[] = 'touch-punch';
+ $scripts->add( 'iris', '/wp-admin/js/iris.min.js', $iris_deps, false, 1 );
+
+ $scripts->add( 'wp-color-picker', "/wp-admin/js/wp-color-picker$suffix.js", array( 'iris' ), false, 1 );
+ did_action( 'init' ) && $scripts->localize( 'wp-color-picker', 'wpColorPickerL10n', array(
+ 'clear' => __( 'Clear' ),
+ 'defaultString' => __( 'Default' ),
+ 'pick' => __( 'Select Color' )
+ ));
+
$scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), false, 1 );
$scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" );
@@ -429,7 +441,7 @@
'saveAlert' => __('The changes you made will be lost if you navigate away from this page.')
) );
- $scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array('farbtastic'), false, 1 );
+ $scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array('wp-color-picker'), false, 1 );
$scripts->add( 'media-gallery', "/wp-admin/js/media-gallery$suffix.js", array('jquery'), false, 1 );
}
}
@@ -482,6 +494,7 @@
$styles->add( 'install', "/wp-admin/css/install$suffix.css" );
$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css' );
$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
+ $styles->add( 'wp-color-picker', '/wp-admin/css/wp-color-picker.css' );
$styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
$styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
$styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css" );
Index: wp-content/themes/twentyeleven/inc/theme-options.php
===================================================================
--- wp-content/themes/twentyeleven/inc/theme-options.php (revision 21626)
+++ wp-content/themes/twentyeleven/inc/theme-options.php (working copy)
@@ -17,8 +17,8 @@
*/
function twentyeleven_admin_enqueue_scripts( $hook_suffix ) {
wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', false, '2011-04-28' );
- wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js', array( 'farbtastic' ), '2011-06-10' );
- wp_enqueue_style( 'farbtastic' );
+ wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js', array( 'wp-color-picker' ), '2011-06-10' );
+ wp_enqueue_style( 'wp-color-picker' );
}
add_action( 'admin_print_styles-appearance_page_theme_options', 'twentyeleven_admin_enqueue_scripts' );
@@ -268,12 +268,8 @@
function twentyeleven_settings_field_link_color() {
$options = twentyeleven_get_theme_options();
?>
-
-
-
-
-
- ' . twentyeleven_get_default_link_color( $options['color_scheme'] ) . '' ); ?>
+
+ />
');
-
- farbtastic = $.farbtastic('#colorPickerDiv', pickColor);
-
- pickColor( $('#link-color').val() );
-
- $('.pickcolor').click( function(e) {
- $('#colorPickerDiv').show();
- e.preventDefault();
- });
-
- $('#link-color').keyup( function() {
- var a = $('#link-color').val(),
- b = a;
-
- a = a.replace(/[^a-fA-F0-9]/, '');
- if ( '#' + a !== b )
- $('#link-color').val(a);
- if ( a.length === 3 || a.length === 6 )
- pickColor( '#' + a );
- });
-
- $(document).mousedown( function() {
- $('#colorPickerDiv').hide();
- });
-
- $('#default-color a').click( function(e) {
- pickColor( '#' + this.innerHTML.replace(/[^a-fA-F0-9]/, '') );
- e.preventDefault();
- });
-
+ $('#link-color').wpColorPicker();
$('.image-radio-option.color-scheme input:radio').change( function() {
- var currentDefault = $('#default-color a'),
+ var currentDefault = $('#link-color').attr('data-default-color'),
newDefault = $(this).next().val();
-
- if ( $('#link-color').val() == currentDefault.text() )
- pickColor( newDefault );
-
- currentDefault.text( newDefault );
+
+ if ( $('#link-color').val() == currentDefault.toString() )
+ $("#link-color").iris("option", "color", newDefault )
});
});
})(jQuery);
\ No newline at end of file
Index: wp-admin/js/wp-color-picker.js
===================================================================
--- wp-admin/js/wp-color-picker.js (revision 0)
+++ wp-admin/js/wp-color-picker.js (revision 0)
@@ -0,0 +1,116 @@
+( function( $, undef ){
+
+ // html stuff
+ var _before = '';
+ var _after = '';
+ var _wrap = '';
+ var _button = '';
+
+ // jQuery UI Widget constructor
+ var ColorPicker = {
+ options: {
+ defaultColor: false,
+ change: false,
+ clear: false,
+ hide: true
+ },
+ _create: function() {
+ // bail early for IE < 8
+ if ( $.browser.msie && parseInt( $.browser.version, 10 ) < 8 )
+ return;
+ var self = this;
+ var el = self.element;
+ $.extend( self.options, el.data() );
+
+ self.initialValue = el.val();
+
+ // Set up HTML structure, hide things
+ el.addClass( 'wp-color-picker' ).hide().wrap( _wrap );
+ self.wrap = el.parent();
+ self.toggler = $( _before ).insertBefore( el ).css( { backgroundColor: self.initialValue } ).attr( "title", wpColorPickerL10n.pick );
+ self.pickerContainer = $( _after ).insertAfter( el );
+ self.button = $( _button );
+
+ if ( self.options.defaultColor )
+ self.button.addClass( 'wp-picker-default' ).val( wpColorPickerL10n.defaultString );
+ else
+ self.button.addClass( 'wp-picker-clear' ).val( wpColorPickerL10n.clear );
+
+ self.button.insertAfter( el );
+
+ el.iris( {
+ target: self.pickerContainer,
+ hide: true,
+ change: function( event, ui ) {
+ self.toggler.css( { backgroundColor: ui.color.toString() } );
+ // check for a custom cb
+ if ( $.isFunction( self.options.change ) )
+ self.options.change.call( this, event, ui );
+ }
+ } );
+ el.val( self.initialValue );
+ self._addListeners();
+ if ( ! self.options.hide )
+ self.toggler.click();
+ },
+ _addListeners: function() {
+ var self = this;
+
+ self.toggler.click( function( event ){
+ event.stopPropagation();
+ self.element.toggle().iris( 'toggle' );
+ self.button.toggleClass('hidden');
+ self.toggler.toggleClass( 'wp-picker-open' );
+
+ // close picker when you click outside it
+ if ( self.toggler.hasClass( 'wp-picker-open' ) )
+ $( "body" ).on( 'click', { wrap: self.wrap, toggler: self.toggler }, self._bodyListener );
+ else
+ $( "body" ).off( 'click', self._bodyListener );
+ });
+
+ // if we have a clear callback, handle empty values in the field
+ if ( $.isFunction( self.options.clear ) ) {
+ self.element.change(function( event ) {
+ var val = self.element.val();
+ if ( val === '' || val === '#' )
+ self.options.clear.call( this, event );
+ });
+ }
+
+ // open a keyboard-focused closed picker with space or enter
+ $( document ).keydown( function( e ) {
+ if ( self.wrap.is( ':focus' ) && e.keyCode === 13 || e.keyCode === 32 ) {
+ e.preventDefault();
+ self.toggler.trigger('click').next().focus();
+ }
+ });
+
+ self.button.click( function( event ) {
+ var me = $(this);
+ if ( me.hasClass( 'wp-picker-clear' ) ) {
+ self.element.val( '' );
+ self.toggler.css('backgroundColor', '');
+ if ( $.isFunction( self.options.clear ) )
+ self.options.clear.call( this, event );
+ } else if ( me.hasClass( 'wp-picker-default' ) ) {
+ self.element.val( self.options.defaultColor ).change();
+ }
+ });
+ },
+ _bodyListener: function( event ) {
+ if ( ! event.data.wrap.find( event.target ).length )
+ event.data.toggler.click();
+ },
+ // $("#input").wpColorPicker('color') returns the current color
+ // $("#input").wpColorPicker('color', '#bada55') to set
+ color: function( newColor ) {
+ if ( newColor === undef )
+ return this.element.iris( "option", "color" );
+
+ this.element.iris( "option", "color", newColor );
+ }
+ }
+
+ $.widget( 'wp.wpColorPicker', ColorPicker );
+}( jQuery ) );
\ No newline at end of file
Index: wp-admin/js/custom-background.js
===================================================================
--- wp-admin/js/custom-background.js (revision 21626)
+++ wp-admin/js/custom-background.js (working copy)
@@ -1,66 +1,24 @@
-var farbtastic, pickColor;
-
(function($) {
- var defaultColor = '';
-
- pickColor = function(color) {
- farbtastic.setColor(color);
- $('#background-color').val(color);
- $('#custom-background-image').css('background-color', color);
- // If we have a default color, and they match, then we need to hide the 'Default' link.
- // Otherwise, we hide the 'Clear' link when it is empty.
- if ( ( defaultColor && color === defaultColor ) || ( ! defaultColor && ( '' === color || '#' === color ) ) )
- $('#clearcolor').hide();
- else
- $('#clearcolor').show();
- }
-
$(document).ready(function() {
+ var bgImage = $("#custom-background-image");
- defaultColor = $('#defaultcolor').val();
-
- $('#pickcolor').click(function() {
- $('#colorPickerDiv').show();
- return false;
+ $('#background-color').wpColorPicker({
+ change: function( event, ui ) {
+ bgImage.css('background-color', ui.color.toString());
+ },
+ clear: function() {
+ bgImage.css('background-color', '');
+ }
});
- $('#clearcolor a').click( function(e) {
- pickColor( defaultColor );
- e.preventDefault();
- });
-
- $('#background-color').keyup(function() {
- var _hex = $('#background-color').val(), hex = _hex;
- if ( hex.charAt(0) != '#' )
- hex = '#' + hex;
- hex = hex.replace(/[^#a-fA-F0-9]+/, '');
- if ( hex != _hex )
- $('#background-color').val(hex);
- if ( hex.length == 4 || hex.length == 7 )
- pickColor( hex );
- });
-
$('input[name="background-position-x"]').change(function() {
- $('#custom-background-image').css('background-position', $(this).val() + ' top');
+ bgImage.css('background-position', $(this).val() + ' top');
});
$('input[name="background-repeat"]').change(function() {
- $('#custom-background-image').css('background-repeat', $(this).val());
+ bgImage.css('background-repeat', $(this).val());
});
-
- farbtastic = $.farbtastic('#colorPickerDiv', function(color) {
- pickColor(color);
- });
- pickColor($('#background-color').val());
-
- $(document).mousedown(function(){
- $('#colorPickerDiv').each(function(){
- var display = $(this).css('display');
- if ( display == 'block' )
- $(this).fadeOut(2);
- });
- });
});
})(jQuery);
\ No newline at end of file
Index: wp-admin/js/customize-controls.js
===================================================================
--- wp-admin/js/customize-controls.js (revision 21626)
+++ wp-admin/js/customize-controls.js (working copy)
@@ -109,27 +109,21 @@
api.ColorControl = api.Control.extend({
ready: function() {
var control = this,
- rhex, spot, input, text, update;
+ rhex, input;
rhex = /^#([A-Fa-f0-9]{3}){0,2}$/;
- spot = this.container.find('.dropdown-content');
input = new api.Element( this.container.find('.color-picker-hex') );
- update = function( color ) {
- spot.css( 'background', color );
- control.farbtastic.setColor( color );
- };
-
- this.farbtastic = $.farbtastic( this.container.find('.farbtastic-placeholder'), control.setting.set );
-
+
+ this.container.find('.color-picker-hex').wpColorPicker({
+ change: function( event, options ) {
+ control.setting.set( options.color.toCSS() );
+ }
+ });
+
// Only pass through values that are valid hexes/empty.
input.sync( this.setting ).validate = function( to ) {
return rhex.test( to ) ? to : null;
};
-
- this.setting.bind( update );
- update( this.setting() );
-
- this.dropdownInit();
}
});
Index: wp-admin/js/iris.min.js
===================================================================
--- wp-admin/js/iris.min.js (revision 0)
+++ wp-admin/js/iris.min.js (revision 0)
@@ -0,0 +1,4 @@
+/*! Iris - v0.9.3 - 2012-08-26
+* https://github.com/Automattic/Iris
+* Copyright (c) 2012 Matt Wiebe; Licensed GPL */
+(function(a,b){function h(){if(d)e="filter";else{var b=a(''),c="linear-gradient(top,#fff,#000)";a.each(f,function(a,d){b.css("backgroundImage",d+c);if(b.css("backgroundImage").match("gradient"))return e=a,!1}),a.browser.webkit&&e===!1&&(b.css("background","-webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#000))"),b.css("backgroundImage").match("gradient")&&(e="webkit")),b.remove()}}function i(b,c){return b=b==="top"?"top":"left",c=a.isArray(c)?c:Array.prototype.slice.call(arguments,1),e==="webkit"?k(b,c):f[e]+"linear-gradient("+b+", "+c.join(", ")+")"}function j(b,c){b=b==="top"?"top":"left",c=a.isArray(c)?c:Array.prototype.slice.call(arguments,1);var d=b==="top"?0:1,e=a(this),f=c.length-1,g=parseInt(a.browser.version,10)>=8?"-ms-filter":"filter";g="filter";var h=d===1?"left":"top",i=d===1?"right":"bottom",j=d===1?"height":"width",k='',m="";e.css("position")==="static"&&e.css({position:"relative"}),c=l(c),a.each(c,function(a,b){if(a===f)return!1;var e=c[a+1];if(b.stop===e.stop)return;var g=100-parseFloat(e.stop)+"%";b.octoHex=(new Color(b.color)).toIEOctoHex(),e.octoHex=(new Color(e.color)).toIEOctoHex();var h="progid:DXImageTransform.Microsoft.Gradient(GradientType="+d+", StartColorStr='"+b.octoHex+"', EndColorStr='"+e.octoHex+"')";m+=k.replace("%start%",b.stop).replace("%end%",g).replace("%filter%",h)}),e.find(".iris-ie-gradient-shim").remove(),a(m).prependTo(e)}function k(b,c){var d=[];return b=b==="top"?"0% 0%,0% 100%,":"0% 100%,100% 100%,",c=l(c),a.each(c,function(a,b){d.push("color-stop("+parseFloat(b.stop)/100+", "+b.color+")")}),"-webkit-gradient(linear,"+b+d.join(",")+")"}function l(b){var c=[],d=[],e=[],f=b.length-1;return a.each(b,function(a,b){var e=b,f=!1,g=b.match(/1?[0-9]{1,2}%$/);g&&(e=b.replace(/\s?1?[0-9]{1,2}%$/,""),f=g.shift()),c.push(e),d.push(f)}),d[0]===!1&&(d[0]="0%"),d[f]===!1&&(d[f]="100%"),d=m(d),a.each(d,function(a){e[a]={color:c[a],stop:d[a]}}),e}function m(b){var c=0,d=b.length-1,e=0,f=!1,g,h,i,j;if(b.length<=2||a.inArray(!1,b)<0)return b;while(e'),d.css("position","relative"),d.children(".grad-box").css({position:"absolute",top:0,left:0,bottom:0,right:0}));var f=d.find(".lum"),g=d.find(".sat");e||f.gradient("top","#fff","rgba(255,255,255,0) 50%","rgba(0,0,0,0) 50%","rgba(0,0,0,1)"),g.gradient("left","hsl("+c+",0%,50%)","hsl("+c+",100%,50%)"),d.data("hue",c)})},a.fn.raninbowGradient=function(b,c){b=b||"top";var d=a.extend({},{s:100,l:50},c),e="hsl(%h%,"+d.s+"%,"+d.l+"%)",f=0,g=[];while(f<=360)g.push(e.replace("%h%",f)),f+=30;return this.each(function(){a(this).gradient(b,g)})};var n={options:{color:!1,hide:!0,border:!0,target:!1,width:200},_inited:!1,_create:function(){var b=this.element,d=this.options.color||b.val();e===!1&&h(),b.is("input")?(this.options.target?this.picker=a(c).appendTo(this.options.target):this.picker=a(c).insertAfter(b),this._addInputListeners(b)):(b.append(c),this.picker=b.find(".iris-picker"));if(a.browser.mozilla)this.picker.addClass("iris-mozilla");else if(a.browser.msie){var f=parseInt(a.browser.version,10);f===9?this.picker.addClass("iris-ie-9"):f<=8&&this.picker.addClass("iris-ie-lt9")}this.color=new Color(d),this.options.color=this.color.toString(),this.controls={},this.controls.square=this.picker.find(".iris-square"),this.controls.result=this.picker.find(".iris-result");var g=this.hue=this.color.h();this.options.hide&&this.picker.hide(),this.options.border&&this.picker.addClass("iris-border"),this.controls.square.LSSquare(g),this.picker.find(".iris-hue").raninbowGradient(),this._initControls(),this.active="external",this._dimensions(),this._change()},_dimensions:function(a){var b=this.picker.find(".iris-picker-inner"),c=this.controls,d=c.square,e=this.picker.find(".iris-hue"),f="77.5%",g="12%",h=20,i=this.options.border?this.options.width-h:this.options.width,j;a&&(d.css("width",""),e.css("width",""),this.picker.removeAttr("style")),f=i*(parseFloat(f)/100),g=i*(parseFloat(g)/100),j=this.options.border?f+h:f,d.width(f).height(f),e.height(f).width(g),this.picker.css({width:this.options.width,height:j})},_addInputListeners:function(a){var b=this;a.on("change",function(c){var d=new Color(a.val()),e=a.val().replace(/^#/,"");a.removeClass("iris-error"),d.error?e!==""&&a.addClass("iris-error"):b._setOption("color",d.toString())})},_initControls:function(){var b=this,c=b.controls.square,d=b.color.h();b.controls.h=b.picker.find(".iris-hue .iris-slider-offset").slider({orientation:"vertical",max:359,min:0,value:359-d,slide:function(a,c){b.active="h",c.value=359-c.value,b.color.h(c.value),b._change.apply(b,arguments)}}),b.controls.squareDrag=b.picker.find(".iris-square-value").draggable({containment:"parent",zIndex:1e3,cursor:"move",drag:function(a,c){b._squareDrag(a,c)},start:function(){c.addClass("iris-dragging")},stop:function(){c.removeClass("iris-dragging")}}),c.mousedown(function(c){if(c.button!==0)return;if(!a(c.target).is("div"))return;var d=b.controls.square.offset(),e={top:c.pageY-d.top,left:c.pageX-d.left};c.preventDefault(),b._squareDrag(c,{position:e}),c.target=b.controls.squareDrag.get(0),b.controls.squareDrag.css(e).trigger(c)}),b.controls.s=c.find(".iris-square-horiz").slider({slide:function(a,c){b.color.s(c.value),b.active="s",b._change.apply(b,arguments)}}),b.controls.l=c.find(".iris-square-vert").slider({orientation:"vertical",slide:function(a,c){b.color.l(c.value),b.active="l",b._change.apply(b,arguments)}}),b.controls.square.mousemove(function(c){var d=a(this),e=d.offset(),f=c.pageX-e.left,g=c.pageY-e.top,h=d.find(".iris-square-horiz .ui-slider-handle"),i=d.find(".iris-square-vert .ui-slider-handle");f>b.controls.square.width()-20?i.addClass("active"):i.removeClass("active"),g<20?h.addClass("active"):h.removeClass("active")}),b.controls.square.mouseleave(function(){a(this).find(".iris-square-slider .ui-slider-handle").removeClass("active")})},_squareDrag:function(a,b){var c=this,d=c._squareDimensions(),e=Math.round((d.h-b.position.top)/d.h*100),f=100-Math.round((d.w-b.position.left)/d.w*100);c.color.s(f).l(e),c.active="square",c._change.apply(c,arguments)},_setOption:function(a,b){var c=this.options[a];if(a==="color"){b=""+b;var d=b.replace(/^#/,""),e=new Color(b);e.error||(this.color=e,this.options.color=this.color.toString(),this.active="external",this._change(),this.options[a]=this.color.toString())}},_squareDimensions:function(a){var c=this.controls.square,d,e;return a!==b&&c.data("dimensions")?c.data("dimensions"):(e=this.controls.squareDrag,d={w:c.width(),h:c.height()},c.data("dimensions",d),d)},_change:function(b,c){var d=this,e=d.controls,f=d.color.toHsl(),g=d.color.toString(),h=["s","l","square"];d.active==="external"||d.active==="h"?(e.square.LSSquare(f.h),d.active==="h"?h=[]:h.push("h"),this.hue=f.h):f.h!==this.hue&&(f.h=this.hue,d.color.h(this.hue)),g=d.color.toString(),a.each(h,function(a,b){if(b!==d.active)switch(b){case"h":e.h.slider("value",359-f.h);break;case"s":d.active!=="l"&&e.s.slider("value",f.s);break;case"l":d.active!=="s"&&e.l.slider("value",f.l);break;case"square":var c=d._squareDimensions(),g={left:f.s/100*c.w,top:c.h-f.l/100*c.h};d.active==="s"?delete g.top:d.active==="l"&&delete g.left,d.controls.squareDrag.css(g)}}),this.controls.result.css("backgroundColor",g),this.options.color=this.color.toString(),this.element.is(":input")&&!d.color.error&&this.element.val(g).removeClass("iris-error"),this._inited&&this._trigger("change",{type:this.active},{color:this.color}),this._inited=!0,this.active=!1},show:function(){this.picker.show()},hide:function(){this.picker.hide()},toggle:function(){this.picker.toggle()}};a.widget("a8c.iris",n),a('").appendTo("head")})(jQuery),function(a,b){var c=function(a,b){return this instanceof c?this._init(a,b):new c(a,b)};c.prototype={_color:0,_alpha:1,error:!1,__hsl:{h:0,s:0,l:0},_init:function(a){var c="noop";switch(typeof a){case"object":return this._alpha=a.a||1,c=a.r!==b?"fromRgb":a.l!==b?"fromHsl":c,this[c](a);case"string":return this.fromCSS(a);case"number":return this.fromInt(parseInt(a,10))}return this},noop:function(){return this},fromCSS:function(a){var b,c;return this.error=!1,a.match(/^(rgb|hsl)a?/)?(c=a.replace(/(\s|%)/g,"").replace(/^(rgb|hsl)a?\(/,"").replace(/\);?$/,"").split(","),c.length===4&&(this._alpha=parseFloat(c.pop())),a.match(/^rgb/)?this.fromRgb({r:parseInt(c[0],10),g:parseInt(c[1],10),b:parseInt(c[2],10)}):this.fromHsl({h:parseInt(c[0],10),s:parseInt(c[1],10),l:parseInt(c[2],10)})):this.fromHex(a)},fromRgb:function(a,c){return typeof a!="object"||a.r===b||a.g===b||a.b===b?(this.error=!0,this):(this.error=!1,this.fromInt(parseInt((a.r<<16)+(a.g<<8)+a.b,10),c))},fromHex:function(a){return a=a.replace(/^#/,"").replace(/^0x/,""),a.length===3&&(a=a[0]+a[0]+a[1]+a[1]+a[2]+a[2]),this.error=!/^[0-9A-F]{6}$/i.test(a),this.fromInt(parseInt(a,16))},fromHsl:function(a){if(typeof a!="object"||a.h===b||a.s===b||a.l===b)return this.error=!0,this;var c,d,e,f,g,h,i,j;return this.__hsl=a,h=a.h/360,i=a.s/100,j=a.l/100,i===0?c=d=e=j:(f=j<.5?j*(1+i):j+i-j*i,g=2*j-f,c=this.hue2rgb(g,f,h+1/3),d=this.hue2rgb(g,f,h),e=this.hue2rgb(g,f,h-1/3)),this.fromRgb({r:c*255,g:d*255,b:e*255},!0)},fromInt:function(a,c){return this._color=parseInt(a,10),isNaN(this._color)&&(this._color=0),this._color>16777215?this._color=16777215:this._color<0&&(this._color=0),c===b&&(this.__hsl.h=this.__hsl.s=0),this},hue2rgb:function(a,b,c){return c<0&&(c+=1),c>1&&(c-=1),c<1/6?a+(b-a)*6*c:c<.5?b:c<2/3?a+(b-a)*(2/3-c)*6:a},toString:function(){var a=parseInt(this._color,10).toString(16);if(this.error)return"";if(a.length<6)for(var b=6-a.length-1;b>=0;b--)a="0"+a;return"#"+a},toCSS:function(a,b){a=a||"hex",b=parseFloat(b||this._alpha);switch(a){case"rgb":case"rgba":var c=this.toRgb();return b<1?"rgba( "+c.r+", "+c.g+", "+c.b+", "+b+" )":"rgb( "+c.r+", "+c.g+", "+c.b+" )";case"hsl":case"hsla":var d=this.toHsl();return b<1?"hsla( "+d.h+", "+d.s+", "+d.l+", "+b+" )":"hsl( "+d.h+", "+d.s+", "+d.l+" )";default:return this.toString()}},toRgb:function(){return{r:255&this._color>>16,g:255&this._color>>8,b:255&this._color}},toHsl:function(){var a=this.toRgb(),b=a.r/255,c=a.g/255,d=a.b/255,e=Math.max(b,c,d),f=Math.min(b,c,d),g,h,i=(e+f)/2;if(e===f)g=h=0;else{var j=e-f;h=i>.5?j/(2-e-f):j/(e+f);switch(e){case b:g=(c-d)/j+(cd?(b+.05)/(d+.05):(d+.05)/(b+.05)}throw"getDistanceLuminosityFrom requires a Color object"},getMaxContrastColor:function(){var a=this.toLuminosity(),b=a>=.5?"000000":"ffffff";return new c(b)},getGrayscaleContrastingColor:function(a){if(!a)return this.getMaxContrastColor();var b=a<5?5:a,c=this.getMaxContrastColor();a=c.getDistanceLuminosityFrom(this);if(a<=b)return c;var d=0===c.toInt()?1:-1;while(a>b)c=c.incrementLightness(d),a=c.getDistanceLuminosityFrom(this);return c},getReadableContrastingColor:function(a,d){if(!a instanceof c)return this;var e=d===b?5:d,f=a.getDistanceLuminosityFrom(this),g=a.getMaxContrastColor(),h=g.getDistanceLuminosityFrom(a);if(h<=e)return g;if(f>=e)return this;var i=0===g.toInt()?-1:1;while(f100?100:c,this.fromHsl(d))},darken:function(a){return a=a||5,this.incrementLightness(-a)},lighten:function(a){return a=a||5,this.incrementLightness(a)},incrementLightness:function(a){return this.l(this.l()+a)},saturate:function(a){return a=a||15,this.incrementSaturation(a)},desaturate:function(a){return a=a||15,this.incrementSaturation(-a)},incrementSaturation:function(a){return this.s(this.s()+a)},toGrayscale:function(){return this.h(0)},getComplement:function(){return this.incrementHue(180)},getSplitComplement:function(a){a=a||1;var b=180+a*30;return this.incrementHue(b)},getAnalog:function(a){a=a||1;var b=a*30;return this.incrementHue(b)},getTetrad:function(a){a=a||1;var b=a*60;return this.incrementHue(b)},getTriad:function(a){a=a||1;var b=a*120;return this.incrementHue(b)},incrementHue:function(a){return this.h(this.h()+a)}},a.Color=c}(typeof exports=="object"&&exports||this);
\ No newline at end of file
Index: wp-admin/custom-header.php
===================================================================
--- wp-admin/custom-header.php (revision 21626)
+++ wp-admin/custom-header.php (working copy)
@@ -175,7 +175,7 @@
wp_enqueue_script( 'media-upload' );
wp_enqueue_script( 'custom-header' );
if ( current_theme_supports( 'custom-header', 'header-text' ) )
- wp_enqueue_script('farbtastic');
+ wp_enqueue_script('wp-color-picker');
} elseif ( 2 == $step ) {
wp_enqueue_script('imgareaselect');
}
@@ -190,7 +190,7 @@
$step = $this->step();
if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
- wp_enqueue_style('farbtastic');
+ wp_enqueue_style('wp-color-picker');
elseif ( 2 == $step )
wp_enqueue_style('imgareaselect');
}
@@ -332,7 +332,6 @@
function js_1() { ?>