Changeset 26277

Timestamp:

11/20/2013 01:34:41 AM (11 years ago)

Author:

azaozz

Message:

Widgets:

• Fix support for expanding (wide) widgets in the Inactive Widgets area.
• Remove resizing of the sidebars height.
• Stop removing unneeded "for" attributes from labels inside the widgets. Was a fix for IE6 odd behaviour.

See #26117.

Location:

trunk/src/wp-admin

Files:

• css/wp-admin.css (modified) (4 diffs)
• js/widgets.js (modified) (8 diffs)

trunk/src/wp-admin/css/wp-admin.css

@@ -10305 +10305 @@
     padding: 15px 15px;
 }
+
 div#widgets-right .sidebar-name .sidebar-name-arrow:before {
     right: 0;
     top: 4px;
 }
+
 div#widgets-right .widget-top {
     padding: 0;
     background: #f7f7f7;
 }
+
 div#widgets-right .widget-title-action {
     float: right;
@@ -10319 +10322 @@
     right: 10px;
 }
+
 div#widgets-right a.widget-action:after {
     content: '\f111';
     color: #888;
 }
+
 div#widgets-right .widget-inside {
     border-top: 1px solid #dedede;
@@ -10328 +10333 @@
 
 div#widgets-right .widgets-sortables {
-    min-height: 42px !important; /* Inline styles */
     padding: 0 8px;
     margin-bottom: 8px;
     position: relative;
 }
+
 div#widgets-right .widgets-sortables:before {
     display: block;
@@ -10347 +10352 @@
     font-weight: 600;
     color: #aaa;
+}
+
+.sidebar-name .spinner {
+    margin: -5px 5px;
+    float: none;
 }
 

trunk/src/wp-admin/js/widgets.js

@@ -11 +11 @@
             selectSidebar = chooser.find('.widgets-chooser-sidebars'),
             sidebars = $('div.widgets-sortables'),
-            isRTL = !! ( 'undefined' !== typeof isRtl && isRtl ),
-            margin = ( isRTL ? 'marginRight' : 'marginLeft' );
+            isRTL = !! ( 'undefined' !== typeof isRtl && isRtl );
 
         $('#widgets-right').children('.widgets-holder-wrap').children('.sidebar-name').click( function() {
@@ -28 +27 @@
         });
 
-        sidebars.each(function(){
-            if ( $(this).parent().hasClass('inactive') )
-                return true;
-
-            var h = 50, H = $(this).children('.widget').length;
-            h = h + parseInt(H * 48, 10);
-            $(this).css( 'minHeight', h + 'px' );
-        });
-
         $(document.body).bind('click.widgets-toggle', function(e){
-            var target = $(e.target), css = {}, widget, inside, w;
+            var target = $(e.target), css = { 'z-index': 100 }, widget, inside, w;
 
             if ( target.parents('.widget-top').length && ! target.parents('#available-widgets').length ) {
                 widget = target.closest('div.widget');
                 inside = widget.children('.widget-inside');
-                w = parseInt( widget.find('input.widget-width').val(), 10 );
+                targetWidth = parseInt( widget.find('input.widget-width').val(), 10 ),
+                widgetWidth = widget.width();
 
                 if ( inside.is(':hidden') ) {
-                    if ( w > 250 && inside.closest('div.widgets-sortables').length ) {
-                        if ( inside.closest('div.widget-liquid-right').length )
-                            css[margin] = 235 - w + 'px';
-                        widget.css(css);
+                    if ( targetWidth > 250 && ( targetWidth + 30 > widgetWidth ) && widget.closest('div.widgets-sortables').length ) {
+                        if ( widget.closest('div.widget-liquid-right').length ) {
+                            margin = isRTL ? 'margin-right' : 'margin-left';
+                        } else {
+                            margin = isRTL ? 'margin-left' : 'margin-right';
+                        }
+
+                        css[ margin ] = widgetWidth - ( targetWidth + 30 ) + 'px';
+                        widget.css( css );
                     }
-                    wpWidgets.fixLabels(widget);
                     inside.slideDown('fast');
                 } else {
                     inside.slideUp('fast', function() {
-                        widget.css({'width':'', margin:''});
+                        widget.attr( 'style', '' );
                     });
                 }
@@ -105 +100 @@
             start: function(e,ui) {
                 ui.item.children('.widget-inside').hide();
-                ui.item.css({margin:'', 'width':''});
             },
             stop: function(e,ui) {
@@ -122 +116 @@
                     sb = $(this).attr('id');
 
-                ui.item.css({margin:'', 'width':''});
+                ui.item.attr( 'style', '' );
                 the_id = '';
 
@@ -259 +253 @@
             $('.spinner').hide();
         });
-
-        this.resize();
     },
 
@@ -299 +291 @@
                 } else {
                     widget.remove();
-                    wpWidgets.resize();
                 }
             } else {
@@ -306 +297 @@
                     $('div.widget-content', widget).html(r);
                     wpWidgets.appendTitle(widget);
-                    wpWidgets.fixLabels(widget);
                 }
             }
@@ -325 +315 @@
     },
 
-    resize : function() {
-        $('div.widgets-sortables').each(function(){
-            if ( $(this).parent().hasClass('inactive') )
-                return true;
-
-            var h = 50, H = $(this).children('.widget').length;
-            h = h + parseInt(H * 48, 10);
-            $(this).css( 'minHeight', h + 'px' );
-        });
-    },
-
-    fixLabels : function(widget) {
-        widget.children('.widget-inside').find('label').each(function(){
-            var f = $(this).attr('for');
-            if ( f && f === $('input', this).attr('id') )
-                $(this).removeAttr('for');
-        });
-    },
-
     close : function(widget) {
-        widget.children('.widget-inside').slideUp('fast', function(){
-            widget.css({'width':'', margin:''});
+        widget.children('.widget-inside').slideUp('fast', function() {
+            widget.attr( 'style', '' );
         });
     },