Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-13 02:51:33 +01:00
Code Issues Projects Releases Wiki Activity

When the submenu is too long to fit on the screen, place the top if it under the admin bar (the rest is scrollable with a wheel mouse), fixes #19323

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19487 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-11-30 03:37:15 +00:00
parent 69cd88fc6f
commit 880ac093a1
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/js/common.dev.js
View File

@ -184,19 +184,26 @@ $(document).ready( function() {
$('li.wp-has-submenu', menu).hoverIntent({ $('li.wp-has-submenu', menu).hoverIntent({
over: function(e){ over: function(e){
var b, h, o, f, m = $(this).find('.wp-submenu'); var b, h, o, f, m = $(this).find('.wp-submenu'), menutop, wintop, maxtop;
if ( !$(document.body).hasClass('folded') && $(this).hasClass('wp-menu-open') ) if ( !$(document.body).hasClass('folded') && $(this).hasClass('wp-menu-open') )
return; return;
b = $(this).offset().top + m.height() + 1; // Bottom offset of the menu menutop = $(this).offset().top;
wintop = $(window).scrollTop();
maxtop = menutop - wintop - 30; // max = make the top of the sub almost touch admin bar
b = menutop + m.height() + 1; // Bottom offset of the menu
h = $('#wpwrap').height(); // Height of the entire page h = $('#wpwrap').height(); // Height of the entire page
o = 60 + b - h; o = 60 + b - h;
f = $(window).height() + $(window).scrollTop() - 15; // The fold f = $(window).height() + wintop - 15; // The fold
if ( f < (b - o) ) if ( f < (b - o) )
o = b - f; o = b - f;
if ( o > maxtop )
o = maxtop;
if ( o > 1 ) if ( o > 1 )
m.css({'marginTop':'-'+o+'px'}); m.css({'marginTop':'-'+o+'px'});
else if ( m.css('marginTop') ) else if ( m.css('marginTop') )

2
wp-admin/js/common.js
View File

File diff suppressed because one or more lines are too long

2
wp-includes/script-loader.php
View File

@ -61,7 +61,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' ); $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20111129', 1 ); $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20111129a', 1 );
$scripts->localize( 'common', 'commonL10n', array( $scripts->localize( 'common', 'commonL10n', array(
'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete.") 'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete.")
) ); ) );