Ticket #20614: 20614.7-tabs.2.diff

wp-admin/js/common.js

@@ -211 +211 @@
                                 el.addClass('opensub');
                         }
                 });
-        } else {
-                menu.find('li.wp-has-submenu').hoverIntent({
-                        over: function(e){
-                                var b, h, o, f, m = $(this).find('.wp-submenu'), menutop, wintop, maxtop, top = parseInt( m.css('top'), 10 );
+        }
 
-                                if ( isNaN(top) || top > -5 ) // meaning the submenu is visible
-                                        return;
+        menu.find('li.wp-has-submenu').hoverIntent({
+                over: function(e){
+                        var b, h, o, f, m = $(this).find('.wp-submenu'), menutop, wintop, maxtop, top = parseInt( m.css('top'), 10 );
 
-                                menutop = $(this).offset().top;
-                                wintop = $(window).scrollTop();
-                                maxtop = menutop - wintop - 30; // max = make the top of the sub almost touch admin bar
+                        if ( isNaN(top) || top > -5 ) // meaning the submenu is visible
+                                return;
 
-                                b = menutop + m.height() + 1; // Bottom offset of the menu
-                                h = $('#wpwrap').height(); // Height of the entire page
-                                o = 60 + b - h;
-                                f = $(window).height() + wintop - 15; // The fold
+                        menutop = $(this).offset().top;
+                        wintop = $(window).scrollTop();
+                        maxtop = menutop - wintop - 30; // max = make the top of the sub almost touch admin bar
 
-                                if ( f < (b - o) )
-                                        o = b - f;
+                        b = menutop + m.height() + 1; // Bottom offset of the menu
+                        h = $('#wpwrap').height(); // Height of the entire page
+                        o = 60 + b - h;
+                        f = $(window).height() + wintop - 15; // The fold
 
-                                if ( o > maxtop )
-                                        o = maxtop;
+                        if ( f < (b - o) )
+                                o = b - f;
 
-                                if ( o > 1 )
-                                        m.css('margin-top', '-'+o+'px');
-                                else
-                                        m.css('margin-top', '');
+                        if ( o > maxtop )
+                                o = maxtop;
 
-                                menu.find('li.menu-top').removeClass('opensub');
-                                $(this).addClass('opensub');
-                        },
-                        out: function(){
-                                $(this).removeClass('opensub').find('.wp-submenu').css('margin-top', '');
-                        },
-                        timeout: 200,
-                        sensitivity: 7,
-                        interval: 90
-                });
+                        if ( o > 1 )
+                                m.css('margin-top', '-'+o+'px');
+                        else
+                                m.css('margin-top', '');
 
-                menu.on('focus.adminmenu', '.wp-submenu a', function(e){
-                        $(e.target).closest('li.menu-top').addClass('opensub');
-                }).on('blur.adminmenu', '.wp-submenu a', function(e){
-                        $(e.target).closest('li.menu-top').removeClass('opensub');
-                });
-        }
+                        menu.find('li.menu-top').removeClass('opensub');
+                        $(this).addClass('opensub');
+                },
+                out: function(){
+                        $(this).removeClass('opensub').find('.wp-submenu').css('margin-top', '');
+                },
+                timeout: 200,
+                sensitivity: 7,
+                interval: 90
+        });
 
+        menu.on('focus.adminmenu', '.wp-submenu a', function(e){
+                $(e.target).closest('li.menu-top').addClass('opensub');
+        }).on('blur.adminmenu', '.wp-submenu a', function(e){
+                $(e.target).closest('li.menu-top').removeClass('opensub');
+        });
+
         // Move .updated and .error alert boxes. Don't move boxes designed to be inline.
         $('div.wrap h2:first').nextAll('div.updated, div.error').addClass('below-h2');
         $('div.updated, div.error').not('.below-h2, .inline').insertAfter( $('div.wrap h2:first') );

wp-includes/js/admin-bar.js

@@ -30 +30 @@
                                         el.addClass('hover');
                                 }
                         });
-                } else {
-                        adminbar.find('li.menupop').hoverIntent({
-                                over: function(e){
-                                        $(this).addClass('hover');
-                                },
-                                out: function(e){
-                                        $(this).removeClass('hover');
-                                },
-                                timeout: 180,
-                                sensitivity: 7,
-                                interval: 100
-                        });
                 }
 
+                adminbar.find('li.menupop').hoverIntent({
+                        over: function(e){
+                                $(this).addClass('hover');
+                        },
+                        out: function(e){
+                                $(this).removeClass('hover');
+                        },
+                        timeout: 180,
+                        sensitivity: 7,
+                        interval: 100
+                });
+
                 $('#wp-admin-bar-get-shortlink').click(function(e){
                         e.preventDefault();
                         $(this).addClass('selected').children('.shortlink-input').blur(function(){