Ticket #5997: 5997.diff

wp-includes/js/wp-lists.js

@@ -8 +8 @@
                 var q = s.split('?'); if ( q[1] ) { s = q[1]; }
                 var pp = s.split('&');
                 for ( var i in pp ) {
+                        if ( $.isFunction(pp.hasOwnProperty) && !pp.hasOwnProperty(i) ) { continue; }
                         var p = pp[i].split('=');
                         r[p[0]] = p[1];
                 }

wp-admin/includes/widgets.php

@@ -63 +63 @@
                                 ) ), "add-widget_$widget[id]" );
                         } else {
                                 $action = 'edit';
-                                $edit_url = add_query_arg( array(
+                                $edit_url = clean_url( add_query_arg( array(
                                         'sidebar' => $sidebar,
                                         'edit' => $widget['id'],
                                         'key' => array_search( $widget['id'], $sidebars_widgets[$sidebar] ),
-                                ) );
-                                $widget_control_template = '<textarea>' . htmlspecialchars( $widget_control_template ) . '</textarea>';
+                                ) ) );
+                                $widget_control_template = '<li><textarea rows="1" cols="1">' . htmlspecialchars( $widget_control_template ) . '</textarea></li>';
                         }
 
                         $no_widgets_shown = false;

wp-admin/js/widgets.js

@@ -6 +6 @@
         // Open or close widget control form
         var toggleWidget = function( li ) {
                 var width = li.find('input.widget-width').val();
-                return li.children('div.widget-control').each( function() {
+
+                // it seems IE chokes on these animations because of the positioning/floating
+                var widgetAnim = $.browser.msie ? function() {
                         var t = $(this);
                         if ( t.is(':visible') ) {
-                                t.animate( { height: 'hide' } );
+                                li.css( 'marginLeft', 0 );
+                                t.siblings('h4').children('a').text( widgetsL10n.edit );
+                        } else {
                                 if ( width > 250 )
+                                        li.css( 'marginLeft', ( width - 250 ) * -1 );
+                                t.siblings('h4').children('a').text( widgetsL10n.cancel );
+                        }
+                        t.toggle();
+                } : function() {
+                        var t = $(this);
+
+                        if ( t.is(':visible') ) {
+                                if ( width > 250 )
                                         li.animate( { marginLeft: 0 } );
                                 t.siblings('h4').children('a').text( widgetsL10n.edit );
                         } else {
-                                t.animate( { height: 'show' } );
                                 if ( width > 250 )
                                         li.animate( { marginLeft: ( width - 250 ) * -1 } );
                                 t.siblings('h4').children('a').text( widgetsL10n.cancel );
                         }
-                } ).end();
+                        t.animate( { height: 'toggle' } );
+                };
+
+                return li.children('div.widget-control').each( widgetAnim ).end();
         };
 
         // onclick for edit links

wp-admin/css/widgets-rtl.css

@@ -34 +34 @@
         right: auto;
 }
 
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited {
+        right: auto;
+        left: 2em;
+}
+
 li.widget-list-control-item div.widget-control {
         padding: 0 0 0 10px;
 }

wp-admin/css/widgets.css

@@ -14 +14 @@
         float: right;
         clear: right;
         width: 300px;
+        position: relative;
 }
 
 /* pasitioning etc. */
@@ -95 +96 @@
 }
 
 li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4 {
-        position: relative;
         margin: 0;
         background-color: #2683ae;
         padding: .5em 1em;
@@ -113 +113 @@
         border-bottom: none;
 }
 
-li.widget-list-control-item h4.widget-title a, li.widget-list-control-item h4.widget-title a:visited {
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited {
         color: #fff;
+        right: 2em;
 }
 
 li.widget-list-control-item h4.widget-title a:hover {