Ticket #14466: 14466.diff

wp-admin/css/ie.dev.css

@@ -379 +379 @@
         width: 99%;
 }
 
-#wp_inactive_widgets {
+#sidebar-wp_inactive_widgets {
         padding-bottom: 8px;
 }
 
@@ -408 +408 @@
 }
 
 .widget-liquid-right .widget,
-#wp_inactive_widgets .widget {
+#sidebar-wp_inactive_widgets .widget {
         position: relative;
 }
 

wp-admin/css/widgets.dev.css

@@ -28 +28 @@
 }
 
 .widget-liquid-right .widget,
-#wp_inactive_widgets .widget,
+#sidebar-wp_inactive_widgets .widget,
 .widget-liquid-right .sidebar-description {
         width: 250px;
         margin: 0 auto 20px;
@@ -39 +39 @@
         margin-bottom: 10px;
 }
 
-#wp_inactive_widgets .widget {
+#sidebar-wp_inactive_widgets .widget {
         margin: 0 10px 20px;
         float: left;
 }
@@ -108 +108 @@
         padding: 7px 5px 0;
 }
 
-#wp_inactive_widgets {
+#sidebar-wp_inactive_widgets {
         padding: 5px 5px 0;
 }
 
@@ -140 +140 @@
         width: 250px;
 }
 
-#wp_inactive_widgets .widget-placeholder {
+#sidebar-wp_inactive_widgets .widget-placeholder {
         margin: 0 10px 20px;
         float: left;
 }
@@ -274 +274 @@
 
 #available-widgets .widget-control-edit .add,
 #widgets-right .widget-control-edit .edit,
-#wp_inactive_widgets .widget-control-edit .edit {
+#sidebar-wp_inactive_widgets .widget-control-edit .edit {
         display: inline;
 }
 

wp-admin/includes/widgets.php

@@ -67 +67 @@
 function wp_list_widget_controls( $sidebar ) {
         add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' );
 
-        echo "<div id='$sidebar' class='widgets-sortables'>\n";
+        echo "<div id='sidebar-$sidebar' class='widgets-sortables'>\n";
 
         $description = wp_sidebar_description( $sidebar );
 

wp-admin/js/widgets.dev.js

@@ -21 +21 @@
                         $(this).siblings('.widget-holder').parent().toggleClass('closed');
                 });
 
-                sidebars.not('#wp_inactive_widgets').each(function(){
+                sidebars.not('#sidebar-wp_inactive_widgets').each(function(){
                         var h = 50, H = $(this).children('.widget').length;
                         h = h + parseInt(H * 48, 10);
                         $(this).css( 'minHeight', h + 'px' );
@@ -175 +175 @@
                 };
 
                 $('div.widgets-sortables').each( function() {
-                        a['sidebars[' + $(this).attr('id') + ']'] = $(this).sortable('toArray').join(',');
+                        a['sidebars[' + wpWidgets.stripSidebarId($(this).attr('id')) + ']'] = $(this).sortable('toArray').join(','); //
                 });
 
                 $.post( ajaxurl, a, function() {
@@ -186 +186 @@
         },
 
         save : function(widget, del, animate, order) {
-                var sb = widget.closest('div.widgets-sortables').attr('id'), data = widget.find('form').serialize(), a;
+                var sb = wpWidgets.stripSidebarId(widget.closest('div.widgets-sortables').attr('id')), data = widget.find('form').serialize(), a;
                 widget = $(widget);
                 $('.ajax-feedback', widget).css('visibility', 'visible');
 
@@ -246 +246 @@
         },
 
         resize : function() {
-                $('div.widgets-sortables').not('#wp_inactive_widgets').each(function(){
+                $('div.widgets-sortables').not('#sidebar-wp_inactive_widgets').each(function(){
                         var h = 50, H = $(this).children('.widget').length;
                         h = h + parseInt(H * 48, 10);
                         $(this).css( 'minHeight', h + 'px' );
@@ -273 +273 @@
                 widget.children('.widget-inside').slideUp('fast', function(){
                         widget.css({'width':'','marginLeft':''});
                 });
+        },
+        
+        stripSidebarId : function(id) {
+                return id.replace(/sidebar-/, '');
         }
 };