<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29898] trunk/src/wp-admin/js/common.js: Admin menu:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/29898">29898</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/29898","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-15 06:04:15 +0000 (Wed, 15 Oct 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Admin menu:
- Fix pinning after resizing the window.
- Merge the two DOM ready callbacks in common.js
- Fix the submenus position adjustment on focus.
See <a href="https://core.trac.wordpress.org/ticket/29806">#29806</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscommonjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/common.js 2014-10-15 05:48:05 UTC (rev 29897)
+++ trunk/src/wp-admin/js/common.js 2014-10-15 06:04:15 UTC (rev 29898)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,14 +173,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $(document).ready( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var checks, first, last, checked, sliced, mobileEvent, transitionTimeout, focusedRowActions,
</span><span class="cx" style="display: block; padding: 0 10px"> lastClicked = false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- menu = $('#adminmenu'),
</del><span class="cx" style="display: block; padding: 0 10px"> pageInput = $('input.current-page'),
</span><span class="cx" style="display: block; padding: 0 10px"> currentPage = pageInput.val(),
</span><span class="cx" style="display: block; padding: 0 10px"> isIOS = /iPhone|iPad|iPod/.test( navigator.userAgent ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- isAndroid = navigator.userAgent.indexOf( 'Android' ) !== -1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isAndroid = navigator.userAgent.indexOf( 'Android' ) !== -1,
+ $document = $( document ),
+ $window = $( window ),
+ $body = $( document.body ),
+ $adminMenuWrap = $( '#adminmenuwrap' ),
+ $wpwrap = $( '#wpwrap' ),
+ $adminmenu = $( '#adminmenu' ),
+ $overlay = $( '#wp-responsive-overlay' ),
+ $toolbar = $( '#wp-toolbar' ),
+ $toolbarPopups = $toolbar.find( 'a[aria-haspopup="true"]' ),
+ $sortables = $('.meta-box-sortables'),
+ wpResponsiveActive = false,
+ $adminbar = $( '#wpadminbar' ),
+ lastScrollPosition = 0,
+ pinnedMenuTop = false,
+ pinnedMenuBottom = false,
+ menuTop = 0,
+ height = {
+ window: $window.height(),
+ adminbar: $adminbar.height(),
+ menu: $adminMenuWrap.height()
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // when the menu is folded, make the fly-out submenu header clickable
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- menu.on('click.wp-submenu-head', '.wp-submenu-head', function(e){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $adminmenu.on('click.wp-submenu-head', '.wp-submenu-head', function(e){
</ins><span class="cx" style="display: block; padding: 0 10px"> $(e.target).parent().siblings('a').get(0).click();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,133 +245,116 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( document ).trigger( 'wp-collapse-menu', { state: state } );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function adjustSubmenu( $menuItem ) {
+ var bottomOffset, pageHeight, adjustment, theFold, menutop, wintop, maxtop,
+ $submenu = $menuItem.find( '.wp-submenu' );
+
+ menutop = $menuItem.offset().top;
+ wintop = $window.scrollTop();
+ maxtop = menutop - wintop - 30; // max = make the top of the sub almost touch admin bar
+
+ bottomOffset = menutop + $submenu.height() + 1; // Bottom offset of the menu
+ pageHeight = $wpwrap.height(); // Height of the entire page
+ adjustment = 60 + bottomOffset - pageHeight;
+ theFold = $window.height() + wintop - 50; // The fold
+
+ if ( theFold < ( bottomOffset - adjustment ) ) {
+ adjustment = bottomOffset - theFold;
+ }
+
+ if ( adjustment > maxtop ) {
+ adjustment = maxtop;
+ }
+
+ if ( adjustment > 1 ) {
+ $submenu.css( 'margin-top', '-' + adjustment + 'px' );
+ } else {
+ $submenu.css( 'margin-top', '' );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'ontouchstart' in window || /IEMobile\/[1-9]/.test(navigator.userAgent) ) { // touch screen device
</span><span class="cx" style="display: block; padding: 0 10px"> // iOS Safari works with touchstart, the rest work with click
</span><span class="cx" style="display: block; padding: 0 10px"> mobileEvent = isIOS ? 'touchstart' : 'click';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // close any open submenus when touch/click is not on the menu
</span><span class="cx" style="display: block; padding: 0 10px"> $(document.body).on( mobileEvent+'.wp-mobile-hover', function(e) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( menu.data('wp-responsive') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $adminmenu.data('wp-responsive') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $(e.target).closest('#adminmenu').length ) {
- menu.find('li.wp-has-submenu.opensub').removeClass('opensub');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $( e.target ).closest( '#adminmenu' ).length ) {
+ $adminmenu.find( 'li.opensub' ).removeClass( 'opensub' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- menu.find('a.wp-has-submenu').on( mobileEvent+'.wp-mobile-hover', function(e) {
- var b, h, o, f, menutop, wintop, maxtop,
- el = $(this),
- parent = el.parent(),
- m = parent.find('.wp-submenu');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $adminmenu.find( 'a.wp-has-submenu' ).on( mobileEvent + '.wp-mobile-hover', function( event ) {
+ var $menuItem = $(this).parent();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( menu.data('wp-responsive') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $adminmenu.data( 'wp-responsive' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Show the sub instead of following the link if:
</span><span class="cx" style="display: block; padding: 0 10px"> // - the submenu is not open
</span><span class="cx" style="display: block; padding: 0 10px"> // - the submenu is not shown inline or the menu is not folded
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !parent.hasClass('opensub') && ( !parent.hasClass('wp-menu-open') || parent.width() < 40 ) ) {
- e.preventDefault();
-
- menutop = parent.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
- o = 60 + b - h;
- f = $(window).height() + wintop - 50; // The fold
-
- if ( f < (b - o) ) {
- o = b - f;
- }
-
- if ( o > maxtop ) {
- o = maxtop;
- }
-
- if ( o > 1 ) {
- m.css('margin-top', '-'+o+'px');
- } else {
- m.css('margin-top', '');
- }
-
- menu.find('li.opensub').removeClass('opensub');
- parent.addClass('opensub');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $menuItem.hasClass( 'opensub' ) && ( ! $menuItem.hasClass( 'wp-menu-open' ) || $menuItem.width() < 40 ) ) {
+ event.preventDefault();
+ adjustSubmenu( $menuItem );
+ $adminmenu.find( 'li.opensub' ).removeClass( 'opensub' );
+ $menuItem.addClass('opensub');
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isIOS && ! isAndroid ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- menu.find('li.wp-has-submenu').hoverIntent({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $adminmenu.find( 'li.wp-has-submenu' ).hoverIntent({
</ins><span class="cx" style="display: block; padding: 0 10px"> over: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var b, h, o, f, m = $(this).find('.wp-submenu'), menutop, wintop, maxtop, top = parseInt( m.css('top'), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $menuItem = $( this ),
+ $submenu = $menuItem.find( '.wp-submenu' ),
+ top = parseInt( $submenu.css( 'top' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isNaN(top) || top > -5 ) { // meaning the submenu is visible
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isNaN( top ) || top > -5 ) { // the submenu is visible
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( menu.data('wp-responsive') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $adminmenu.data( 'wp-responsive' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // The menu is in responsive mode, bail
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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
- o = 60 + b - h;
- f = $(window).height() + wintop - 15; // The fold
-
- if ( f < (b - o) ) {
- o = b - f;
- }
-
- if ( o > maxtop ) {
- o = maxtop;
- }
-
- if ( o > 1 ) {
- m.css('margin-top', '-'+o+'px');
- } else {
- m.css('margin-top', '');
- }
-
- menu.find('li.menu-top').removeClass('opensub');
- $(this).addClass('opensub');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ adjustSubmenu( $menuItem );
+ $adminmenu.find( 'li.opensub' ).removeClass( 'opensub' );
+ $menuItem.addClass( 'opensub' );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> out: function(){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( menu.data('wp-responsive') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $adminmenu.data( 'wp-responsive' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // The menu is in responsive mode, bail
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(this).removeClass('opensub').find('.wp-submenu').css('margin-top', '');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( this ).removeClass( 'opensub' ).find( '.wp-submenu' ).css( 'margin-top', '' );
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> timeout: 200,
</span><span class="cx" style="display: block; padding: 0 10px"> sensitivity: 7,
</span><span class="cx" style="display: block; padding: 0 10px"> interval: 90
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- menu.on('focus.adminmenu', '.wp-submenu a', function(e){
- if ( menu.data('wp-responsive') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $adminmenu.on( 'focus.adminmenu', '.wp-submenu a', function( event ) {
+ if ( $adminmenu.data( 'wp-responsive' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // The menu is in responsive mode, bail
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(e.target).closest('li.menu-top').addClass('opensub');
- }).on('blur.adminmenu', '.wp-submenu a', function(e){
- if ( menu.data('wp-responsive') ) {
- // The menu is in responsive mode, bail
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( event.target ).closest( 'li.menu-top' ).addClass( 'opensub' );
+ }).on( 'blur.adminmenu', '.wp-submenu a', function( event ) {
+ if ( $adminmenu.data( 'wp-responsive' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(e.target).closest('li.menu-top').removeClass('opensub');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( event.target ).closest( 'li.menu-top' ).removeClass( 'opensub' );
+ }).find( 'li.wp-has-submenu' ).on( 'focusin.adminmenu', function() {
+ adjustSubmenu( $( this ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,60 +531,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> toggleUploadButton();
</span><span class="cx" style="display: block; padding: 0 10px"> input.on('change', toggleUploadButton);
</span><span class="cx" style="display: block; padding: 0 10px"> })();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-});
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Fire a custom jQuery event at the end of window resize
-( function() {
- var timeout;
-
- function triggerEvent() {
- $(document).trigger( 'wp-window-resized' );
- }
-
- function fireOnce() {
- window.clearTimeout( timeout );
- timeout = window.setTimeout( triggerEvent, 200 );
- }
-
- $(window).on( 'resize.wp-fire-once', fireOnce );
-}());
-
-$(document).ready( function() {
- var $document = $( document ),
- $window = $( window ),
- $body = $( document.body ),
- $adminMenuWrap = $( '#adminmenuwrap' ),
- $wpwrap = $( '#wpwrap' ),
- $adminmenu = $( '#adminmenu' ),
- $overlay = $( '#wp-responsive-overlay' ),
- $toolbar = $( '#wp-toolbar' ),
- $toolbarPopups = $toolbar.find( 'a[aria-haspopup="true"]' ),
- $sortables = $('.meta-box-sortables'),
- wpResponsiveActive = false,
- $adminbar = $( '#wpadminbar' ),
- lastScrollPosition = 0,
- fixedMenuTop = false,
- fixedMenuBottom = false,
- menuTop = 0,
- height = {
- window: $window.height(),
- adminbar: $adminbar.height(),
- menu: $adminMenuWrap.height()
- };
-
</del><span class="cx" style="display: block; padding: 0 10px"> function pinMenu() {
</span><span class="cx" style="display: block; padding: 0 10px"> var windowPos = $window.scrollTop();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $adminmenu.data('wp-responsive') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isIOS || $adminmenu.data('wp-responsive') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( height.menu + height.adminbar > height.window ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( windowPos > lastScrollPosition ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Scrolling down
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( fixedMenuTop ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( pinnedMenuTop ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // let it scroll
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fixedMenuTop = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ pinnedMenuTop = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> menuTop = $adminMenuWrap.offset().top - height.adminbar;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $adminMenuWrap.css({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,9 +552,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> top: menuTop,
</span><span class="cx" style="display: block; padding: 0 10px"> bottom: ''
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! fixedMenuBottom && $adminMenuWrap.offset().top + height.menu < windowPos + height.window ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( ! pinnedMenuBottom && $adminMenuWrap.offset().top + height.menu < windowPos + height.window ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // pin the bottom
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fixedMenuBottom = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ pinnedMenuBottom = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $adminMenuWrap.css({
</span><span class="cx" style="display: block; padding: 0 10px"> position: 'fixed',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,9 +564,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( windowPos < lastScrollPosition ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Scrolling up
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( fixedMenuBottom ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( pinnedMenuBottom ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // let it scroll
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fixedMenuBottom = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ pinnedMenuBottom = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> menuTop = $adminMenuWrap.offset().top - height.adminbar;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $adminMenuWrap.css({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,9 +574,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> top: menuTop,
</span><span class="cx" style="display: block; padding: 0 10px"> bottom: ''
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! fixedMenuTop && $adminMenuWrap.offset().top >= windowPos + height.adminbar ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( ! pinnedMenuTop && $adminMenuWrap.offset().top >= windowPos + height.adminbar ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // pin the top
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- fixedMenuTop = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ pinnedMenuTop = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $adminMenuWrap.css({
</span><span class="cx" style="display: block; padding: 0 10px"> position: 'fixed',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,31 +584,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bottom: ''
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ // Resizing
+ pinnedMenuTop = pinnedMenuBottom = false;
+ menuTop = $adminMenuWrap.offset().top - height.adminbar;
+
+ $adminMenuWrap.css({
+ position: 'absolute',
+ top: menuTop,
+ bottom: ''
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> lastScrollPosition = windowPos;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function unpinMenu() {
+ if ( isIOS ) {
+ return;
+ }
+
+ pinnedMenuTop = pinnedMenuBottom = false;
+ $adminMenuWrap.css({
+ position: '',
+ top: '',
+ bottom: ''
+ });
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function setPinMenu() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $adminmenu.data('wp-responsive') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body.removeClass( 'sticky-menu' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $adminMenuWrap.css({
- position: '',
- top: '',
- bottom: ''
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unpinMenu();
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( height.menu + height.adminbar > height.window ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ pinMenu();
</ins><span class="cx" style="display: block; padding: 0 10px"> $body.removeClass( 'sticky-menu' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- pinMenu();
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $body.addClass( 'sticky-menu' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unpinMenu();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setPinMenu();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $window.on( 'scroll.pin-menu', pinMenu );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isIOS ) {
+ $window.on( 'scroll.pin-menu', pinMenu );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $document.on( 'wp-window-resized.pin-menu', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> height.window = $window.height();
</span><span class="cx" style="display: block; padding: 0 10px"> height.adminbar = $adminbar.height();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -790,6 +777,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> window.wpResponsive.init();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Fire a custom jQuery event at the end of window resize
+( function() {
+ var timeout;
+
+ function triggerEvent() {
+ $(document).trigger( 'wp-window-resized' );
+ }
+
+ function fireOnce() {
+ window.clearTimeout( timeout );
+ timeout = window.setTimeout( triggerEvent, 200 );
+ }
+
+ $(window).on( 'resize.wp-fire-once', fireOnce );
+}());
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Make Windows 8 devices play along nicely.
</span><span class="cx" style="display: block; padding: 0 10px"> (function(){
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '-ms-user-select' in document.documentElement.style && navigator.userAgent.match(/IEMobile\/10\.0/) ) {
</span></span></pre>
</div>
</div>
</body>
</html>