sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Collapse Menu: use jQuery normalized window width only for WebKit. Use window.innerWidth in Firefox, IE > 8, etc. so the window width in JS and for the @media rules match. Fixes #23817. 

git-svn-id: https://develop.svn.wordpress.org/trunk@24619 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2013-07-09 21:26:32 +00:00
parent 01f8aa101e
commit f24c4ee1b3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,16 +169,22 @@ $(document).ready( function() {
});
$('#collapse-menu').on('click.collapse-menu', function(e){
var body = $(document.body);
var body = $( document.body ), respWidth;
// reset any compensation for submenus near the bottom of the screen
$('#adminmenu div.wp-submenu').css('margin-top', '');
if ( $(window).width() < 900 ) {
// WebKit excludes the width of the vertical scrollbar when applying the CSS "@media screen and (max-width: ...)"
// and matches $(window).width().
// Firefox and IE > 8 include the scrollbar width, so after the jQuery normalization
// $(window).width() is 884px but window.innerWidth is 900px.
// (using window.innerWidth also excludes IE < 9)
respWidth = navigator.userAgent.indexOf('AppleWebKit/') > -1 ? $(window).width() : window.innerWidth;
if ( respWidth && respWidth < 900 ) {
if ( body.hasClass('auto-fold') ) {
body.removeClass('auto-fold');
body.removeClass('auto-fold').removeClass('folded');
setUserSetting('unfold', 1);
body.removeClass('folded');
deleteUserSetting('mfold');
} else {
body.addClass('auto-fold');