Don't move current open submenus, see #18382
git-svn-id: https://develop.svn.wordpress.org/trunk@18940 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
b297c030b7
commit
844d8607d8
|
@ -207,6 +207,9 @@ $(document).ready( function() {
|
||||||
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');
|
||||||
|
|
||||||
|
if ( !$(document.body).hasClass('folded') && $(this).hasClass('wp-menu-open') )
|
||||||
|
return;
|
||||||
|
|
||||||
b = $(this).offset().top + m.height() + 1; // Bottom offset of the menu
|
b = $(this).offset().top + 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;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -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'), '20111009', 1 );
|
$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20111011', 1 );
|
||||||
$scripts->add_script_data( 'common', 'commonL10n', array(
|
$scripts->add_script_data( '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.")
|
||||||
) );
|
) );
|
||||||
|
|
Loading…
Reference in New Issue