Cleanup in dashboard.js, props scribu, fixes 17292
git-svn-id: https://develop.svn.wordpress.org/trunk@17784 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
1263400a3d
commit
76ae5355f9
|
@ -10,7 +10,7 @@ jQuery(document).ready( function($) {
|
||||||
];
|
];
|
||||||
|
|
||||||
ajaxPopulateWidgets = function(el) {
|
ajaxPopulateWidgets = function(el) {
|
||||||
show = function(id, i) {
|
function show(i, id) {
|
||||||
var p, e = $('#' + id + ' div.inside:visible').find('.widget-loading');
|
var p, e = $('#' + id + ' div.inside:visible').find('.widget-loading');
|
||||||
if ( e.length ) {
|
if ( e.length ) {
|
||||||
p = e.parent();
|
p = e.parent();
|
||||||
|
@ -23,14 +23,13 @@ jQuery(document).ready( function($) {
|
||||||
}, i * 500 );
|
}, i * 500 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( el ) {
|
if ( el ) {
|
||||||
el = el.toString();
|
el = el.toString();
|
||||||
if ( $.inArray(el, ajaxWidgets) != -1 )
|
if ( $.inArray(el, ajaxWidgets) != -1 )
|
||||||
show(el, 0);
|
show(0, el);
|
||||||
} else {
|
} else {
|
||||||
$.each( ajaxWidgets, function(i, id) {
|
$.each( ajaxWidgets, show );
|
||||||
show(id, i);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
ajaxPopulateWidgets();
|
ajaxPopulateWidgets();
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(a){ajaxWidgets=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins"];ajaxPopulateWidgets=function(b){show=function(g,c){var f,d=a("#"+g+" div.inside:visible").find(".widget-loading");if(d.length){f=d.parent();setTimeout(function(){f.load(ajaxurl.replace("/admin-ajax.php","")+"/index-extra.php?jax="+g,"",function(){f.hide().slideDown("normal",function(){a(this).css("display","")})})},c*500)}};if(b){b=b.toString();if(a.inArray(b,ajaxWidgets)!=-1){show(b,0)}}else{a.each(ajaxWidgets,function(c,d){show(d,c)})}};ajaxPopulateWidgets();postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets});quickPressLoad=function(){var b=a("#quickpost-action"),c;c=a("#quick-press").submit(function(){a("#dashboard_quick_press #publishing-action img.waiting").css("visibility","visible");a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","disabled");if("post"==b.val()){b.val("post-quickpress-publish")}a("#dashboard_quick_press div.inside").load(c.attr("action"),c.serializeArray(),function(){a("#dashboard_quick_press #publishing-action img.waiting").css("visibility","hidden");a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","");a("#dashboard_quick_press ul").next("p").remove();a("#dashboard_quick_press ul").find("li").each(function(){a("#dashboard_recent_drafts ul").prepend(this)}).end().remove();quickPressLoad()});return false});a("#publish").click(function(){b.val("post-quickpress-publish")})};quickPressLoad()});
|
var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(a){ajaxWidgets=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins"];ajaxPopulateWidgets=function(c){function b(d,h){var g,f=a("#"+h+" div.inside:visible").find(".widget-loading");if(f.length){g=f.parent();setTimeout(function(){g.load(ajaxurl.replace("/admin-ajax.php","")+"/index-extra.php?jax="+h,"",function(){g.hide().slideDown("normal",function(){a(this).css("display","")})})},d*500)}}if(c){c=c.toString();if(a.inArray(c,ajaxWidgets)!=-1){b(0,c)}}else{a.each(ajaxWidgets,b)}};ajaxPopulateWidgets();postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets});quickPressLoad=function(){var b=a("#quickpost-action"),c;c=a("#quick-press").submit(function(){a("#dashboard_quick_press #publishing-action img.waiting").css("visibility","visible");a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","disabled");if("post"==b.val()){b.val("post-quickpress-publish")}a("#dashboard_quick_press div.inside").load(c.attr("action"),c.serializeArray(),function(){a("#dashboard_quick_press #publishing-action img.waiting").css("visibility","hidden");a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","");a("#dashboard_quick_press ul").next("p").remove();a("#dashboard_quick_press ul").find("li").each(function(){a("#dashboard_recent_drafts ul").prepend(this)}).end().remove();quickPressLoad()});return false});a("#publish").click(function(){b.val("post-quickpress-publish")})};quickPressLoad()});
|
|
@ -412,7 +412,7 @@ function wp_default_scripts( &$scripts ) {
|
||||||
|
|
||||||
$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
|
$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
|
||||||
|
|
||||||
$scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20110430' );
|
$scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20110430a' );
|
||||||
$scripts->add_data( 'dashboard', 'group', 1 );
|
$scripts->add_data( 'dashboard', 'group', 1 );
|
||||||
|
|
||||||
$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '20090102' );
|
$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '20090102' );
|
||||||
|
|
Loading…
Reference in New Issue