Changeset 11483 for trunk/wp-admin/js/common.dev.js

Timestamp:

05/29/2009 07:42:55 AM (15 years ago)

Author:

azaozz

Message:

Fix submenu position and state on folded admin menu, props sambauers, fixes #9956

File:

• trunk/wp-admin/js/common.dev.js (modified) (2 diffs)

trunk/wp-admin/js/common.dev.js

@@ -27 +27 @@
         if ( $('body').hasClass('folded') ) {
             this.fold();
-        } else {
-            this.restoreMenuState();
-        }
+        }
+        this.restoreMenuState();
     },
 
@@ -62 +61 @@
             $('#adminmenu li.wp-has-submenu').hoverIntent({
                 over: function(e){
-                    var m = $(this).find('.wp-submenu'), t = e.clientY, H = $(window).height(), h = m.height(), o;
-
-                    if ( (t+h+10) > H ) {
-                        o = (t+h+10) - H;
+                    var m, b, h, o, f;
+                    m = $(this).find('.wp-submenu');
+                    b = m.parent().offset().top + m.height() + 1; // Bottom offset of the menu
+                    h = $('#wpwrap').height(); // Height of the entire page
+                    o = 60 + b - h;
+                    f = $(window).height() + $('body').scrollTop() - 15; // The fold
+                    if (f < (b - o)) {
+                        o = b - f;
+                    }
+                    if (o > 1) {
                         m.css({'marginTop':'-'+o+'px'});
                     } else if ( m.css('marginTop') ) {