diff --git a/wp-admin/js/custom-background.js b/wp-admin/js/custom-background.js index c2c64ecce2..66b8bbfd40 100644 --- a/wp-admin/js/custom-background.js +++ b/wp-admin/js/custom-background.js @@ -1 +1 @@ -var farbtastic,pickColor;(function(a){pickColor=function(c,b){farbtastic.setColor(c);a("#background-color").val(c);a("#custom-background-image").css("background-color",c);console.log(c);if(typeof b==="undefined"){b=!c||c==="#"}if(b){a("#clearcolor").hide()}else{a("#clearcolor").show()}};a(document).ready(function(){a("#pickcolor").click(function(){a("#colorPickerDiv").show();return false});a("#clearcolor a").click(function(b){pickColor(a("#defaultcolor").val(),true);b.preventDefault()});a("#background-color").keyup(function(){var c=a("#background-color").val(),b=c;if(b.charAt(0)!="#"){b="#"+b}b=b.replace(/[^#a-fA-F0-9]+/,"");if(b!=c){a("#background-color").val(b)}if(b.length==4||b.length==7){pickColor(b)}});a('input[name="background-position-x"]').change(function(){a("#custom-background-image").css("background-position",a(this).val()+" top")});a('input[name="background-repeat"]').change(function(){a("#custom-background-image").css("background-repeat",a(this).val())});farbtastic=a.farbtastic("#colorPickerDiv",function(b){pickColor(b)});pickColor(a("#background-color").val());a(document).mousedown(function(){a("#colorPickerDiv").each(function(){var b=a(this).css("display");if(b=="block"){a(this).fadeOut(2)}})})})})(jQuery); \ No newline at end of file +var farbtastic,pickColor;(function(b){var a="";pickColor=function(c){farbtastic.setColor(c);b("#background-color").val(c);b("#custom-background-image").css("background-color",c);if((a&&c===a)||(!a&&(""===c||"#"===c))){b("#clearcolor").hide()}else{b("#clearcolor").show()}};b(document).ready(function(){a=b("#defaultcolor").val();b("#pickcolor").click(function(){b("#colorPickerDiv").show();return false});b("#clearcolor a").click(function(c){pickColor(a);c.preventDefault()});b("#background-color").keyup(function(){var d=b("#background-color").val(),c=d;if(c.charAt(0)!="#"){c="#"+c}c=c.replace(/[^#a-fA-F0-9]+/,"");if(c!=d){b("#background-color").val(c)}if(c.length==4||c.length==7){pickColor(c)}});b('input[name="background-position-x"]').change(function(){b("#custom-background-image").css("background-position",b(this).val()+" top")});b('input[name="background-repeat"]').change(function(){b("#custom-background-image").css("background-repeat",b(this).val())});farbtastic=b.farbtastic("#colorPickerDiv",function(c){pickColor(c)});pickColor(b("#background-color").val());b(document).mousedown(function(){b("#colorPickerDiv").each(function(){var c=b(this).css("display");if(c=="block"){b(this).fadeOut(2)}})})})})(jQuery); \ No newline at end of file diff --git a/wp-admin/js/user-suggest.js b/wp-admin/js/user-suggest.js index 544b3840b0..5f17b528d1 100644 --- a/wp-admin/js/user-suggest.js +++ b/wp-admin/js/user-suggest.js @@ -1 +1 @@ -jQuery(function(d){var f=typeof(current_site_id)!="undefined"?"&site_id="+current_site_id:"",c=!!("undefined"!=typeof isRtl&&isRtl),a=c?{my:"right top",at:"right bottom",offset:"0, -1"}:{offset:"0, -1"},b=function(h,g){d(this).addClass("open")},e=function(h,g){d(this).removeClass("open")};d("#adduser-email, #newuser").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=add"+f,delay:500,minLength:2,position:a,open:b,close:e});d("#user-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=search"+f,delay:500,minLength:2,position:a,open:b,close:e});d("#all-user-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=search-all"+f,delay:500,minLength:2,position:a,open:b,close:e})}); \ No newline at end of file +(function(a){var b="undefined"!==typeof current_site_id?"&site_id="+current_site_id:"";a(document).ready(function(){a(".wp-suggest-user").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=add"+b,delay:500,minLength:2,position:("undefined"!==typeof isRtl&&isRtl)?{my:"right top",at:"right bottom",offset:"0, -1"}:{offset:"0, -1"},open:function(){a(this).addClass("open")},close:function(){a(this).removeClass("open")}})})})(jQuery); \ No newline at end of file diff --git a/wp-includes/version.php b/wp-includes/version.php index 29724763d1..6edb6fa0a7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '3.4-RC1-21000'; +$wp_version = '3.4-RC1-21005'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.