Changeset 20911

Timestamp:

05/25/2012 06:58:23 PM (13 years ago)

Author:

bumpbot

Message:

Compress scripts/styles: 3.4-beta4-20911.

Location:

trunk

Files:

• wp-admin/js/custom-background.js (modified) (1 diff)
• wp-includes/js/customize-preview.js (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/js/custom-background.js

@@ -1 @@
-var farbtastic;function pickColor(a){farbtastic.setColor(a);jQuery("#background-color").val(a);jQuery("#custom-background-image").css("background-color",a);if(a&&a!=="#"){jQuery("#clearcolor").show()}else{jQuery("#clearcolor").hide()}}jQuery(document).ready(function(){jQuery("#pickcolor").click(function(){jQuery("#colorPickerDiv").show();return false});jQuery("#clearcolor a").click(function(a){pickColor("");a.preventDefault()});jQuery("#background-color").keyup(function(){var b=jQuery("#background-color").val(),a=b;if(a.charAt(0)!="#"){a="#"+a}a=a.replace(/[^#a-fA-F0-9]+/,"");if(a!=b){jQuery("#background-color").val(a)}if(a.length==4||a.length==7){pickColor(a)}});jQuery('input[name="background-position-x"]').change(function(){jQuery("#custom-background-image").css("background-position",jQuery(this).val()+" top")});jQuery('input[name="background-repeat"]').change(function(){jQuery("#custom-background-image").css("background-repeat",jQuery(this).val())});farbtastic=jQuery.farbtastic("#colorPickerDiv",function(a){pickColor(a)});pickColor(jQuery("#background-color").val());jQuery(document).mousedown(function(){jQuery("#colorPickerDiv").each(function(){var a=jQuery(this).css("display");if(a=="block"){jQuery(this).fadeOut(2)}})})});
+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);

trunk/wp-includes/js/customize-preview.js

@@ -1 @@
-(function(b,d){var c=wp.customize,a;a=function(g,e,f){var h;return function(){var i=arguments;f=f||this;clearTimeout(h);h=setTimeout(function(){h=null;g.apply(f,i)},e)}};c.Preview=c.Messenger.extend({initialize:function(g,f){var e=this;c.Messenger.prototype.initialize.call(this,g,null,f);this.body=d(document.body);this.body.on("click.preview","a",function(h){h.preventDefault();e.send("scroll",0);e.send("url",d(this).prop("href"))});this.body.on("submit.preview","form",function(h){h.preventDefault()});this.window=d(window);this.window.on("scroll.preview",a(function(){e.send("scroll",e.window.scrollTop())},200));this.bind("scroll",function(h){e.window.scrollTop(h)})}});d(function(){c.settings=window._wpCustomizeSettings;if(!c.settings){return}var f,e;f=new c.Preview(window.location.href);d.each(c.settings.values,function(h,g){c.create(h,g)});f.bind("setting",function(g){var h=c(g.shift());if(h){h.set.apply(h,g)}});e=d(document.body);c("background_color",function(g){g.bind(function(h){e.css("background-color",h?"#"+h:"")})})})})(wp,jQuery);
+(function(b,d){var c=wp.customize,a;a=function(g,e,f){var h;return function(){var i=arguments;f=f||this;clearTimeout(h);h=setTimeout(function(){h=null;g.apply(f,i)},e)}};c.Preview=c.Messenger.extend({initialize:function(g,f){var e=this;c.Messenger.prototype.initialize.call(this,g,null,f);this.body=d(document.body);this.body.on("click.preview","a",function(h){h.preventDefault();e.send("scroll",0);e.send("url",d(this).prop("href"))});this.body.on("submit.preview","form",function(h){h.preventDefault()});this.window=d(window);this.window.on("scroll.preview",a(function(){e.send("scroll",e.window.scrollTop())},200));this.bind("scroll",function(h){e.window.scrollTop(h)})}});d(function(){c.settings=window._wpCustomizeSettings;if(!c.settings){return}var f,e;f=new c.Preview(window.location.href);d.each(c.settings.values,function(h,g){c.create(h,g)});f.bind("setting",function(g){var h=c(g.shift());if(h){h.set.apply(h,g)}});e=d.map(["color","image","position_x","repeat","attachment"],function(g){return"background_"+g});c.when.apply(c,e).done(function(g,k,h,j,l){var i=d("#custom-background-css"),m;if(!i.length){return}m=function(){var n="";if(g()){n+="background-color: #"+g()+";"}if(k()){n+='background-image: url("'+k()+'");';n+="background-position: top "+h()+";";n+="background-repeat: "+j()+";";n+="background-position: top "+l()+";"}i.html("body.custom-background { "+n+" }")};d.each(arguments,function(){this.bind(m)})})})})(wp,jQuery);

trunk/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.4-beta4-20900';
+$wp_version = '3.4-beta4-20911';
 
 /**