sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove orphaned sidebars from the page when the user drags all widgets out of them, see #17979 

git-svn-id: https://develop.svn.wordpress.org/trunk@18635 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2011-09-03 21:26:32 +00:00
parent b744e5937e
commit b483e4a464
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-admin/js/widgets.dev.js
View File

@ -22,7 +22,10 @@ wpWidgets = {
$(this).parent().toggleClass('closed'); $(this).parent().toggleClass('closed');
}); });
sidebars.not('#wp_inactive_widgets').each(function(){ sidebars.each(function(){
if ( $(this).parent().hasClass('inactive') )
return true;
var h = 50, H = $(this).children('.widget').length; var h = 50, H = $(this).children('.widget').length;
h = h + parseInt(H * 48, 10); h = h + parseInt(H * 48, 10);
$(this).css( 'minHeight', h + 'px' ); $(this).css( 'minHeight', h + 'px' );
@ -135,8 +138,14 @@ wpWidgets = {
wpWidgets.saveOrder(sb); wpWidgets.saveOrder(sb);
}, },
receive: function(e, ui) { receive: function(e, ui) {
var sender = $(ui.sender);
if ( !$(this).is(':visible') || this.id.indexOf('orphaned_widgets') != -1 ) if ( !$(this).is(':visible') || this.id.indexOf('orphaned_widgets') != -1 )
$(ui.sender).sortable('cancel'); sender.sortable('cancel');
if ( sender.attr('id').indexOf('orphaned_widgets') != -1 && !sender.children('.postbox').length ) {
sender.parents('.orphan-sidebar').slideUp(400, function(){ $(this).remove(); });
}
} }
}).sortable('option', 'connectWith', 'div.widgets-sortables').parent().filter('.closed').children('.widgets-sortables').sortable('disable'); }).sortable('option', 'connectWith', 'div.widgets-sortables').parent().filter('.closed').children('.widgets-sortables').sortable('disable');
@ -176,7 +185,8 @@ wpWidgets = {
}; };
$('div.widgets-sortables').each( function() { $('div.widgets-sortables').each( function() {
a['sidebars[' + $(this).attr('id') + ']'] = $(this).sortable('toArray').join(','); if ( $(this).sortable )
a['sidebars[' + $(this).attr('id') + ']'] = $(this).sortable('toArray').join(',');
}); });
$.post( ajaxurl, a, function() { $.post( ajaxurl, a, function() {
@ -247,7 +257,10 @@ wpWidgets = {
}, },
resize : function() { resize : function() {
$('div.widgets-sortables').not('#wp_inactive_widgets').each(function(){ $('div.widgets-sortables').each(function(){
if ( $(this).parent().hasClass('inactive') )
return true;
var h = 50, H = $(this).children('.widget').length; var h = 50, H = $(this).children('.widget').length;
h = h + parseInt(H * 48, 10); h = h + parseInt(H * 48, 10);
$(this).css( 'minHeight', h + 'px' ); $(this).css( 'minHeight', h + 'px' );

2
wp-admin/js/widgets.js
View File

File diff suppressed because one or more lines are too long