Fix the admin toolbar js when jQuery is not present and replace the jQuery based hoverIntent.js with a native implementation. Introduces the "hoverintent" (no dependencies) package.
Props dinhtungdu, audrasjb, azaozz. Merges [46872] to the 5.3 branch. Fixes #47069. Built from https://develop.svn.wordpress.org/branches/5.3@46873 git-svn-id: http://core.svn.wordpress.org/branches/5.3@46673 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
f5d738e01c
commit
d73f11a4ce
|
@ -1,550 +1,405 @@
|
||||||
/**
|
/**
|
||||||
* @output wp-includes/js/admin-bar.js
|
* @output wp-includes/js/admin-bar.js
|
||||||
*/
|
*/
|
||||||
|
/**
|
||||||
/* jshint loopfunc: true */
|
* Admin bar with Vanilla JS, no external dependencies.
|
||||||
// use jQuery and hoverIntent if loaded
|
*
|
||||||
if ( typeof(jQuery) != 'undefined' ) {
|
* @param {Object} document The document object.
|
||||||
if ( typeof(jQuery.fn.hoverIntent) == 'undefined' ) {
|
* @param {Object} window The window object.
|
||||||
/* jshint ignore:start */
|
* @param {Object} navigator The navigator object.
|
||||||
// hoverIntent v1.8.1 - Copy of wp-includes/js/hoverIntent.min.js
|
*
|
||||||
!function(a){a.fn.hoverIntent=function(b,c,d){var e={interval:100,sensitivity:6,timeout:0};e="object"==typeof b?a.extend(e,b):a.isFunction(c)?a.extend(e,{over:b,out:c,selector:d}):a.extend(e,{over:b,out:b,selector:c});var f,g,h,i,j=function(a){f=a.pageX,g=a.pageY},k=function(b,c){return c.hoverIntent_t=clearTimeout(c.hoverIntent_t),Math.sqrt((h-f)*(h-f)+(i-g)*(i-g))<e.sensitivity?(a(c).off("mousemove.hoverIntent",j),c.hoverIntent_s=!0,e.over.apply(c,[b])):(h=f,i=g,c.hoverIntent_t=setTimeout(function(){k(b,c)},e.interval),void 0)},l=function(a,b){return b.hoverIntent_t=clearTimeout(b.hoverIntent_t),b.hoverIntent_s=!1,e.out.apply(b,[a])},m=function(b){var c=a.extend({},b),d=this;d.hoverIntent_t&&(d.hoverIntent_t=clearTimeout(d.hoverIntent_t)),"mouseenter"===b.type?(h=c.pageX,i=c.pageY,a(d).on("mousemove.hoverIntent",j),d.hoverIntent_s||(d.hoverIntent_t=setTimeout(function(){k(c,d)},e.interval))):(a(d).off("mousemove.hoverIntent",j),d.hoverIntent_s&&(d.hoverIntent_t=setTimeout(function(){l(c,d)},e.timeout)))};return this.on({"mouseenter.hoverIntent":m,"mouseleave.hoverIntent":m},e.selector)}}(jQuery);
|
* @return {void}
|
||||||
/* jshint ignore:end */
|
*/
|
||||||
}
|
( function( document, window, navigator ) {
|
||||||
jQuery(document).ready(function($){
|
document.addEventListener( 'DOMContentLoaded', function() {
|
||||||
var adminbar = $('#wpadminbar'), refresh, touchOpen, touchClose, disableHoverIntent = false;
|
var adminBar = document.getElementById( 'wpadminbar' ),
|
||||||
|
topMenuItems = adminBar.querySelectorAll( 'li.menupop' ),
|
||||||
|
allMenuItems = adminBar.querySelectorAll( '.ab-item' ),
|
||||||
|
adminBarLogout = document.getElementById( 'wp-admin-bar-logout' ),
|
||||||
|
adminBarSearchForm = document.getElementById( 'adminbarsearch' ),
|
||||||
|
shortlink = document.getElementById( 'wp-admin-bar-get-shortlink' ),
|
||||||
|
skipLink = adminBar.querySelector( '.screen-reader-shortcut' ),
|
||||||
|
mobileEvent = /Mobile\/.+Safari/.test( navigator.userAgent ) ? 'touchstart' : 'click',
|
||||||
|
adminBarSearchInput,
|
||||||
|
i;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Forces the browser to refresh the tabbing index.
|
* Remove nojs class after the DOM is loaded.
|
||||||
*
|
|
||||||
* @since 3.3.0
|
|
||||||
*
|
|
||||||
* @param {number} i The index of the HTML element to remove the tab index
|
|
||||||
* from. This parameter is necessary because we use this
|
|
||||||
* function in .each calls.
|
|
||||||
* @param {HTMLElement} el The HTML element to remove the tab index from.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
*/
|
||||||
refresh = function(i, el){
|
adminBar.classList.remove( 'nojs' );
|
||||||
var node = $(el), tab = node.attr('tabindex');
|
|
||||||
if ( tab )
|
|
||||||
node.attr('tabindex', '0').attr('tabindex', tab);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds or removes the hover class on touch.
|
|
||||||
*
|
|
||||||
* @since 3.5.0
|
|
||||||
*
|
|
||||||
* @param {boolean} unbind If true removes the wp-mobile-hover class.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
|
||||||
touchOpen = function(unbind) {
|
|
||||||
adminbar.find('li.menupop').on('click.wp-mobile-hover', function(e) {
|
|
||||||
var el = $(this);
|
|
||||||
|
|
||||||
if ( el.parent().is('#wp-admin-bar-root-default') && !el.hasClass('hover') ) {
|
|
||||||
e.preventDefault();
|
|
||||||
adminbar.find('li.menupop.hover').removeClass('hover');
|
|
||||||
el.addClass('hover');
|
|
||||||
} else if ( !el.hasClass('hover') ) {
|
|
||||||
e.stopPropagation();
|
|
||||||
e.preventDefault();
|
|
||||||
el.addClass('hover');
|
|
||||||
} else if ( ! $( e.target ).closest( 'div' ).hasClass( 'ab-sub-wrapper' ) ) {
|
|
||||||
// We're dealing with an already-touch-opened menu genericon (we know el.hasClass('hover')),
|
|
||||||
// so close it on a second tap and prevent propag and defaults. See #29906
|
|
||||||
e.stopPropagation();
|
|
||||||
e.preventDefault();
|
|
||||||
el.removeClass('hover');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( unbind ) {
|
|
||||||
$('li.menupop').off('click.wp-mobile-hover');
|
|
||||||
disableHoverIntent = false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes the hover class if clicked or touched outside the admin bar.
|
|
||||||
*
|
|
||||||
* @since 3.5.0
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
|
||||||
touchClose = function() {
|
|
||||||
var mobileEvent = /Mobile\/.+Safari/.test(navigator.userAgent) ? 'touchstart' : 'click';
|
|
||||||
// close any open drop-downs when the click/touch is not on the toolbar
|
|
||||||
$(document.body).on( mobileEvent+'.wp-mobile-hover', function(e) {
|
|
||||||
if ( !$(e.target).closest('#wpadminbar').length )
|
|
||||||
adminbar.find('li.menupop.hover').removeClass('hover');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
adminbar.removeClass('nojq').removeClass('nojs');
|
|
||||||
|
|
||||||
// If clicked on the adminbar add the hoverclass, if clicked outside it remove
|
|
||||||
// it.
|
|
||||||
if ( 'ontouchstart' in window ) {
|
if ( 'ontouchstart' in window ) {
|
||||||
adminbar.on('touchstart', function(){
|
/**
|
||||||
touchOpen(true);
|
* Remove hover class when the user touches outside the menu items.
|
||||||
disableHoverIntent = true;
|
*/
|
||||||
});
|
document.body.addEventListener( mobileEvent, function( e ) {
|
||||||
touchClose();
|
if ( ! getClosest( e.target, 'li.menupop' ) ) {
|
||||||
} else if ( /IEMobile\/[1-9]/.test(navigator.userAgent) ) {
|
removeAllHoverClass( topMenuItems );
|
||||||
touchOpen();
|
}
|
||||||
touchClose();
|
} );
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add listener for menu items to toggle hover class by touches.
|
||||||
|
* Remove the callback later for better performance.
|
||||||
|
*/
|
||||||
|
adminBar.addEventListener( 'touchstart', function bindMobileEvents() {
|
||||||
|
for ( var i = 0; i < topMenuItems.length; i++ ) {
|
||||||
|
topMenuItems[i].addEventListener( 'click', mobileHover.bind( null, topMenuItems ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
adminBar.removeEventListener( 'touchstart', bindMobileEvents );
|
||||||
|
} );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adds or removes the hover class based on the hover intent.
|
|
||||||
adminbar.find('li.menupop').hoverIntent({
|
|
||||||
over: function() {
|
|
||||||
if ( disableHoverIntent )
|
|
||||||
return;
|
|
||||||
|
|
||||||
$(this).addClass('hover');
|
|
||||||
},
|
|
||||||
out: function() {
|
|
||||||
if ( disableHoverIntent )
|
|
||||||
return;
|
|
||||||
|
|
||||||
$(this).removeClass('hover');
|
|
||||||
},
|
|
||||||
timeout: 180,
|
|
||||||
sensitivity: 7,
|
|
||||||
interval: 100
|
|
||||||
});
|
|
||||||
|
|
||||||
// Prevents the toolbar from covering up content when a hash is present in the
|
|
||||||
// URL.
|
|
||||||
if ( window.location.hash )
|
|
||||||
window.scrollBy( 0, -32 );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles the selected state of the Shortlink link.
|
* Scroll page to top when clicking on the admin bar.
|
||||||
*
|
|
||||||
* When the input is visible the link should be selected, when the input is
|
|
||||||
* unfocused the link should be unselected.
|
|
||||||
*
|
|
||||||
* @param {Object} e The click event.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
**/
|
|
||||||
$('#wp-admin-bar-get-shortlink').click(function(e){
|
|
||||||
e.preventDefault();
|
|
||||||
$(this).addClass('selected').children('.shortlink-input').blur(function(){
|
|
||||||
$(this).parents('#wp-admin-bar-get-shortlink').removeClass('selected');
|
|
||||||
}).focus().select();
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes the hoverclass if the enter key is pressed.
|
|
||||||
*
|
|
||||||
* Makes sure the tab index is refreshed by refreshing each ab-item
|
|
||||||
* and its children.
|
|
||||||
*
|
|
||||||
* @param {Object} e The keydown event.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
*/
|
||||||
$('#wpadminbar li.menupop > .ab-item').bind('keydown.adminbar', function(e){
|
adminBar.addEventListener( 'click', scrollToTop );
|
||||||
// Key code 13 is the enter key.
|
|
||||||
if ( e.which != 13 )
|
|
||||||
return;
|
|
||||||
|
|
||||||
var target = $(e.target),
|
for ( i = 0; i < topMenuItems.length; i++ ) {
|
||||||
wrap = target.closest('.ab-sub-wrapper'),
|
/**
|
||||||
parentHasHover = target.parent().hasClass('hover');
|
* Adds or removes the hover class based on the hover intent.
|
||||||
|
*/
|
||||||
|
hoverintent(
|
||||||
|
topMenuItems[i],
|
||||||
|
addHoverClass.bind( null, topMenuItems[i] ),
|
||||||
|
removeHoverClass.bind( null, topMenuItems[i] )
|
||||||
|
).options( {
|
||||||
|
timeout: 180,
|
||||||
|
} );
|
||||||
|
|
||||||
e.stopPropagation();
|
/**
|
||||||
e.preventDefault();
|
* Toggle hover class if the enter key is pressed.
|
||||||
|
*/
|
||||||
if ( !wrap.length )
|
topMenuItems[i].addEventListener( 'keydown', toggleHoverIfEnter );
|
||||||
wrap = $('#wpadminbar .quicklinks');
|
}
|
||||||
|
|
||||||
wrap.find('.menupop').removeClass('hover');
|
|
||||||
|
|
||||||
if ( ! parentHasHover ) {
|
|
||||||
target.parent().toggleClass('hover');
|
|
||||||
}
|
|
||||||
|
|
||||||
target.siblings('.ab-sub-wrapper').find('.ab-item').each(refresh);
|
|
||||||
}).each(refresh);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Removes the hover class when the escape key is pressed.
|
* Remove hover class if the escape key is pressed.
|
||||||
*
|
|
||||||
* Makes sure the tab index is refreshed by refreshing each ab-item
|
|
||||||
* and its children.
|
|
||||||
*
|
|
||||||
* @param {Object} e The keydown event.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
*/
|
||||||
$('#wpadminbar .ab-item').bind('keydown.adminbar', function(e){
|
for ( i = 0; i < allMenuItems.length; i++ ) {
|
||||||
// Key code 27 is the escape key.
|
allMenuItems[i].addEventListener( 'keydown', removeHoverIfEscape );
|
||||||
if ( e.which != 27 )
|
}
|
||||||
return;
|
|
||||||
|
|
||||||
var target = $(e.target);
|
if ( adminBarSearchForm ) {
|
||||||
|
adminBarSearchInput = document.getElementById( 'adminbar-search' );
|
||||||
|
|
||||||
e.stopPropagation();
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
target.closest('.hover').removeClass('hover').children('.ab-item').focus();
|
|
||||||
target.siblings('.ab-sub-wrapper').find('.ab-item').each(refresh);
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Scrolls to top of page by clicking the adminbar.
|
|
||||||
*
|
|
||||||
* @param {Object} e The click event.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
|
||||||
adminbar.click( function(e) {
|
|
||||||
if ( e.target.id != 'wpadminbar' && e.target.id != 'wp-admin-bar-top-secondary' ) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
adminbar.find( 'li.menupop.hover' ).removeClass( 'hover' );
|
|
||||||
$( 'html, body' ).animate( { scrollTop: 0 }, 'fast' );
|
|
||||||
e.preventDefault();
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the focus on an element with a href attribute.
|
|
||||||
*
|
|
||||||
* The timeout is used to fix a focus bug in WebKit.
|
|
||||||
*
|
|
||||||
* @param {Object} e The keydown event.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
|
||||||
$('.screen-reader-shortcut').keydown( function(e) {
|
|
||||||
var id, ua;
|
|
||||||
|
|
||||||
if ( 13 != e.which )
|
|
||||||
return;
|
|
||||||
|
|
||||||
id = $( this ).attr( 'href' );
|
|
||||||
|
|
||||||
ua = navigator.userAgent.toLowerCase();
|
|
||||||
|
|
||||||
if ( ua.indexOf('applewebkit') != -1 && id && id.charAt(0) == '#' ) {
|
|
||||||
setTimeout(function () {
|
|
||||||
$(id).focus();
|
|
||||||
}, 100);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$( '#adminbar-search' ).on({
|
|
||||||
/**
|
/**
|
||||||
* Adds the adminbar-focused class on focus.
|
* Adds the adminbar-focused class on focus.
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
*/
|
||||||
focus: function() {
|
adminBarSearchInput.addEventListener( 'focus', function() {
|
||||||
$( '#adminbarsearch' ).addClass( 'adminbar-focused' );
|
adminBarSearchForm.classList.add( 'adminbar-focused' );
|
||||||
|
} );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Removes the adminbar-focused class on blur.
|
* Removes the adminbar-focused class on blur.
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
*/
|
||||||
}, blur: function() {
|
adminBarSearchInput.addEventListener( 'blur', function() {
|
||||||
$( '#adminbarsearch' ).removeClass( 'adminbar-focused' );
|
adminBarSearchForm.classList.remove( 'adminbar-focused' );
|
||||||
}
|
} );
|
||||||
} );
|
|
||||||
|
|
||||||
if ( 'sessionStorage' in window ) {
|
|
||||||
/**
|
|
||||||
* Empties sessionStorage on logging out.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
|
||||||
$('#wp-admin-bar-logout a').click( function() {
|
|
||||||
try {
|
|
||||||
for ( var key in sessionStorage ) {
|
|
||||||
if ( key.indexOf('wp-autosave-') != -1 )
|
|
||||||
sessionStorage.removeItem(key);
|
|
||||||
}
|
|
||||||
} catch(e) {}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Focus the target of skip link after pressing Enter.
|
||||||
|
*/
|
||||||
|
skipLink.addEventListener( 'keydown', focusTargetAfterEnter );
|
||||||
|
|
||||||
|
if ( shortlink ) {
|
||||||
|
shortlink.addEventListener( 'click', clickShortlink );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Prevents the toolbar from covering up content when a hash is present
|
||||||
|
* in the URL.
|
||||||
|
*/
|
||||||
|
if ( window.location.hash ) {
|
||||||
|
window.scrollBy( 0, -32 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add no-font-face class to body if needed.
|
||||||
|
*/
|
||||||
if ( navigator.userAgent && document.body.className.indexOf( 'no-font-face' ) === -1 &&
|
if ( navigator.userAgent && document.body.className.indexOf( 'no-font-face' ) === -1 &&
|
||||||
/Android (1.0|1.1|1.5|1.6|2.0|2.1)|Nokia|Opera Mini|w(eb)?OSBrowser|webOS|UCWEB|Windows Phone OS 7|XBLWP7|ZuneWP7|MSIE 7/.test( navigator.userAgent ) ) {
|
/Android (1.0|1.1|1.5|1.6|2.0|2.1)|Nokia|Opera Mini|w(eb)?OSBrowser|webOS|UCWEB|Windows Phone OS 7|XBLWP7|ZuneWP7|MSIE 7/.test( navigator.userAgent ) ) {
|
||||||
|
|
||||||
document.body.className += ' no-font-face';
|
document.body.className += ' no-font-face';
|
||||||
}
|
}
|
||||||
});
|
|
||||||
} else {
|
/**
|
||||||
|
* Clear sessionStorage on logging out.
|
||||||
|
*/
|
||||||
|
adminBarLogout.addEventListener( 'click', emptySessionStorage );
|
||||||
|
} );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrapper function for the adminbar that's used if jQuery isn't available.
|
* Remove hover class for top level menu item when escape is pressed.
|
||||||
*
|
*
|
||||||
* @param {Object} d The document object.
|
* @since 5.3.0
|
||||||
* @param {Object} w The window object.
|
*
|
||||||
|
* @param {Event} e The keydown event.
|
||||||
|
*/
|
||||||
|
function removeHoverIfEscape( e ) {
|
||||||
|
var wrapper;
|
||||||
|
|
||||||
|
if ( e.which != 27 ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
wrapper = getClosest( e.target, '.menupop' );
|
||||||
|
|
||||||
|
if ( ! wrapper ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
wrapper.querySelector( '.menupop > .ab-item' ).focus();
|
||||||
|
removeHoverClass( wrapper );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggle hover class for top level menu item when enter is pressed.
|
||||||
|
*
|
||||||
|
* @since 5.3.0
|
||||||
|
*
|
||||||
|
* @param {Event} e The keydown event.
|
||||||
|
*/
|
||||||
|
function toggleHoverIfEnter( e ) {
|
||||||
|
var wrapper;
|
||||||
|
|
||||||
|
if ( e.which != 13 ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( !! getClosest( e.target, '.ab-sub-wrapper' ) ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
wrapper = getClosest( e.target, '.menupop' );
|
||||||
|
|
||||||
|
if ( ! wrapper ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
if ( hasHoverClass( wrapper ) ) {
|
||||||
|
removeHoverClass( wrapper );
|
||||||
|
} else {
|
||||||
|
addHoverClass( wrapper );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Focus the target of skip link after pressing Enter.
|
||||||
|
*
|
||||||
|
* @since 5.3.0
|
||||||
|
*
|
||||||
|
* @param {Event} e The keydown event.
|
||||||
|
*/
|
||||||
|
function focusTargetAfterEnter( e ) {
|
||||||
|
var id, userAgent;
|
||||||
|
|
||||||
|
if ( 13 !== e.which ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
id = e.target.getAttribute( 'href' );
|
||||||
|
userAgent = navigator.userAgent.toLowerCase();
|
||||||
|
|
||||||
|
if ( userAgent.indexOf( 'applewebkit' ) != -1 && id && id.charAt( 0 ) == '#' ) {
|
||||||
|
setTimeout( function() {
|
||||||
|
var target = document.getElementById( id.replace( '#', '' ) );
|
||||||
|
|
||||||
|
target.setAttribute( 'tabIndex', '0' );
|
||||||
|
target.focus();
|
||||||
|
}, 100 );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toogle hover class for mobile devices.
|
||||||
|
*
|
||||||
|
* @since 5.3.0
|
||||||
|
*
|
||||||
|
* @param {NodeList} topMenuItems All menu items.
|
||||||
|
* @param {Event} e The click event.
|
||||||
|
*/
|
||||||
|
function mobileHover( topMenuItems, e ) {
|
||||||
|
var wrapper;
|
||||||
|
|
||||||
|
if ( !! getClosest( e.target, '.ab-sub-wrapper' ) ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
wrapper = getClosest( e.target, '.menupop' );
|
||||||
|
|
||||||
|
if ( ! wrapper ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( hasHoverClass( wrapper ) ) {
|
||||||
|
removeHoverClass( wrapper );
|
||||||
|
} else {
|
||||||
|
removeAllHoverClass( topMenuItems );
|
||||||
|
addHoverClass( wrapper );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles the click on the Shortlink link in the adminbar.
|
||||||
|
*
|
||||||
|
* @since 3.1.0
|
||||||
|
* @since 5.3.0 Use querySelector to clean up the function.
|
||||||
|
*
|
||||||
|
* @param {Event} e The click event.
|
||||||
|
*
|
||||||
|
* @return {boolean} Returns false to prevent default click behavior.
|
||||||
|
*/
|
||||||
|
function clickShortlink( e ) {
|
||||||
|
var wrapper = e.target.parentNode,
|
||||||
|
input = wrapper.querySelector( '.shortlink-input' );
|
||||||
|
|
||||||
|
// IE doesn't support preventDefault, and does support returnValue
|
||||||
|
if ( e.preventDefault ) {
|
||||||
|
e.preventDefault();
|
||||||
|
}
|
||||||
|
e.returnValue = false;
|
||||||
|
|
||||||
|
wrapper.classList.add( 'selected' );
|
||||||
|
input.focus();
|
||||||
|
input.select();
|
||||||
|
input.onblur = function() {
|
||||||
|
wrapper.classList.remove( 'selected' );
|
||||||
|
};
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear sessionStorage on logging out.
|
||||||
|
*
|
||||||
|
* @since 5.3.0
|
||||||
|
*/
|
||||||
|
function emptySessionStorage() {
|
||||||
|
if ( 'sessionStorage' in window ) {
|
||||||
|
try {
|
||||||
|
for ( var key in sessionStorage ) {
|
||||||
|
if ( key.indexOf( 'wp-autosave-' ) != -1 ) {
|
||||||
|
sessionStorage.removeItem( key );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch ( e ) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if menu item has hover class.
|
||||||
|
*
|
||||||
|
* @since 5.3.0
|
||||||
|
*
|
||||||
|
* @param {HTMLElement} item Menu item Element.
|
||||||
|
*/
|
||||||
|
function hasHoverClass( item ) {
|
||||||
|
return item.classList.contains( 'hover' );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add hover class for menu item.
|
||||||
|
*
|
||||||
|
* @since 5.3.0
|
||||||
|
*
|
||||||
|
* @param {HTMLElement} item Menu item Element.
|
||||||
|
*/
|
||||||
|
function addHoverClass( item ) {
|
||||||
|
item.classList.add( 'hover' );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Remove hover class for menu item.
|
||||||
|
*
|
||||||
|
* @since 5.3.0
|
||||||
|
*
|
||||||
|
* @param {HTMLElement} item Menu item Element.
|
||||||
|
*/
|
||||||
|
function removeHoverClass( item ) {
|
||||||
|
item.classList.remove( 'hover' );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Remove hover class for all menu items.
|
||||||
|
*
|
||||||
|
* @since 5.3.0
|
||||||
|
*
|
||||||
|
* @param {NodeList} topMenuItems All menu items.
|
||||||
|
*/
|
||||||
|
function removeAllHoverClass( topMenuItems ) {
|
||||||
|
for ( var i = 0; i < topMenuItems.length; i++ ) {
|
||||||
|
if ( hasHoverClass( topMenuItems[i] ) ) {
|
||||||
|
removeHoverClass( topMenuItems[i] );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Scrolls to the top of the page.
|
||||||
|
*
|
||||||
|
* @since 3.4.0
|
||||||
|
*
|
||||||
|
* @param {Event} e The Click event.
|
||||||
*
|
*
|
||||||
* @return {void}
|
* @return {void}
|
||||||
*/
|
*/
|
||||||
(function(d, w) {
|
function scrollToTop( event ) {
|
||||||
/**
|
// Only scroll when clicking on the wpadminbar, not on menus or submenus.
|
||||||
* Adds an event listener to an object.
|
if (
|
||||||
*
|
event.target &&
|
||||||
* @since 3.1.0
|
event.target.id &&
|
||||||
*
|
event.target.id != 'wpadminbar' &&
|
||||||
* @param {Object} obj The object to add the event listener to.
|
event.target.id != 'wp-admin-bar-top-secondary'
|
||||||
* @param {string} type The type of event.
|
) {
|
||||||
* @param {function} fn The function to bind to the event listener.
|
return;
|
||||||
*
|
}
|
||||||
* @return {void}
|
|
||||||
*/
|
try {
|
||||||
var addEvent = function( obj, type, fn ) {
|
window.scrollTo( {
|
||||||
if ( obj && typeof obj.addEventListener === 'function' ) {
|
top: -32,
|
||||||
obj.addEventListener( type, fn, false );
|
left: 0,
|
||||||
} else if ( obj && typeof obj.attachEvent === 'function' ) {
|
behavior: 'smooth'
|
||||||
obj.attachEvent( 'on' + type, function() {
|
} );
|
||||||
return fn.call( obj, window.event );
|
} catch ( er ) {
|
||||||
} );
|
window.scrollTo( 0, -32 );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get closest Element.
|
||||||
|
*
|
||||||
|
* @since 5.3.0
|
||||||
|
*
|
||||||
|
* @param {HTMLElement} el Element to get parent.
|
||||||
|
* @param {string} selector CSS selector to match.
|
||||||
|
*/
|
||||||
|
function getClosest( el, selector ) {
|
||||||
|
if ( ! Element.prototype.matches ) {
|
||||||
|
Element.prototype.matches =
|
||||||
|
Element.prototype.matchesSelector ||
|
||||||
|
Element.prototype.mozMatchesSelector ||
|
||||||
|
Element.prototype.msMatchesSelector ||
|
||||||
|
Element.prototype.oMatchesSelector ||
|
||||||
|
Element.prototype.webkitMatchesSelector ||
|
||||||
|
function( s ) {
|
||||||
|
var matches = ( this.document || this.ownerDocument ).querySelectorAll( s ),
|
||||||
|
i = matches.length;
|
||||||
|
while ( --i >= 0 && matches.item( i ) !== this ) { }
|
||||||
|
return i > -1;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the closest matching elent
|
||||||
|
for ( ; el && el !== document; el = el.parentNode ) {
|
||||||
|
if ( el.matches( selector ) ) {
|
||||||
|
return el;
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
|
return null;
|
||||||
aB, hc = new RegExp('\\bhover\\b', 'g'), q = [],
|
}
|
||||||
rselected = new RegExp('\\bselected\\b', 'g'),
|
} )( document, window, navigator );
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the timeout ID of the given element.
|
|
||||||
*
|
|
||||||
* @since 3.1.0
|
|
||||||
*
|
|
||||||
* @param {HTMLElement} el The HTML element.
|
|
||||||
*
|
|
||||||
* @return {number|boolean} The ID value of the timer that is set or false.
|
|
||||||
*/
|
|
||||||
getTOID = function(el) {
|
|
||||||
var i = q.length;
|
|
||||||
while ( i-- ) {
|
|
||||||
if ( q[i] && el == q[i][1] )
|
|
||||||
return q[i][0];
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds the hoverclass to menu items.
|
|
||||||
*
|
|
||||||
* @since 3.1.0
|
|
||||||
*
|
|
||||||
* @param {HTMLElement} t The HTML element.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
|
||||||
addHoverClass = function(t) {
|
|
||||||
var i, id, inA, hovering, ul, li,
|
|
||||||
ancestors = [],
|
|
||||||
ancestorLength = 0;
|
|
||||||
|
|
||||||
// aB is adminbar. d is document.
|
|
||||||
while ( t && t != aB && t != d ) {
|
|
||||||
if ( 'LI' == t.nodeName.toUpperCase() ) {
|
|
||||||
ancestors[ ancestors.length ] = t;
|
|
||||||
id = getTOID(t);
|
|
||||||
if ( id )
|
|
||||||
clearTimeout( id );
|
|
||||||
t.className = t.className ? ( t.className.replace(hc, '') + ' hover' ) : 'hover';
|
|
||||||
hovering = t;
|
|
||||||
}
|
|
||||||
t = t.parentNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Removes any selected classes.
|
|
||||||
if ( hovering && hovering.parentNode ) {
|
|
||||||
ul = hovering.parentNode;
|
|
||||||
if ( ul && 'UL' == ul.nodeName.toUpperCase() ) {
|
|
||||||
i = ul.childNodes.length;
|
|
||||||
while ( i-- ) {
|
|
||||||
li = ul.childNodes[i];
|
|
||||||
if ( li != hovering )
|
|
||||||
li.className = li.className ? li.className.replace( rselected, '' ) : '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Removes the hover class for any objects not in the immediate element's ancestry.
|
|
||||||
i = q.length;
|
|
||||||
while ( i-- ) {
|
|
||||||
inA = false;
|
|
||||||
ancestorLength = ancestors.length;
|
|
||||||
while( ancestorLength-- ) {
|
|
||||||
if ( ancestors[ ancestorLength ] == q[i][1] )
|
|
||||||
inA = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( ! inA )
|
|
||||||
q[i][1].className = q[i][1].className ? q[i][1].className.replace(hc, '') : '';
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes the hoverclass from menu items.
|
|
||||||
*
|
|
||||||
* @since 3.1.0
|
|
||||||
*
|
|
||||||
* @param {HTMLElement} t The HTML element.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
|
||||||
removeHoverClass = function(t) {
|
|
||||||
while ( t && t != aB && t != d ) {
|
|
||||||
if ( 'LI' == t.nodeName.toUpperCase() ) {
|
|
||||||
(function(t) {
|
|
||||||
var to = setTimeout(function() {
|
|
||||||
t.className = t.className ? t.className.replace(hc, '') : '';
|
|
||||||
}, 500);
|
|
||||||
q[q.length] = [to, t];
|
|
||||||
})(t);
|
|
||||||
}
|
|
||||||
t = t.parentNode;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles the click on the Shortlink link in the adminbar.
|
|
||||||
*
|
|
||||||
* @since 3.1.0
|
|
||||||
*
|
|
||||||
* @param {Object} e The click event.
|
|
||||||
*
|
|
||||||
* @return {boolean} Returns false to prevent default click behavior.
|
|
||||||
*/
|
|
||||||
clickShortlink = function(e) {
|
|
||||||
var i, l, node,
|
|
||||||
t = e.target || e.srcElement;
|
|
||||||
|
|
||||||
// Make t the shortlink menu item, or return.
|
|
||||||
while ( true ) {
|
|
||||||
// Check if we've gone past the shortlink node,
|
|
||||||
// or if the user is clicking on the input.
|
|
||||||
if ( ! t || t == d || t == aB )
|
|
||||||
return;
|
|
||||||
// Check if we've found the shortlink node.
|
|
||||||
if ( t.id && t.id == 'wp-admin-bar-get-shortlink' )
|
|
||||||
break;
|
|
||||||
t = t.parentNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
// IE doesn't support preventDefault, and does support returnValue
|
|
||||||
if ( e.preventDefault )
|
|
||||||
e.preventDefault();
|
|
||||||
e.returnValue = false;
|
|
||||||
|
|
||||||
if ( -1 == t.className.indexOf('selected') )
|
|
||||||
t.className += ' selected';
|
|
||||||
|
|
||||||
for ( i = 0, l = t.childNodes.length; i < l; i++ ) {
|
|
||||||
node = t.childNodes[i];
|
|
||||||
if ( node.className && -1 != node.className.indexOf('shortlink-input') ) {
|
|
||||||
node.focus();
|
|
||||||
node.select();
|
|
||||||
node.onblur = function() {
|
|
||||||
t.className = t.className ? t.className.replace( rselected, '' ) : '';
|
|
||||||
};
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Scrolls to the top of the page.
|
|
||||||
*
|
|
||||||
* @since 3.4.0
|
|
||||||
*
|
|
||||||
* @param {HTMLElement} t The HTML element.
|
|
||||||
*
|
|
||||||
* @return {void}
|
|
||||||
*/
|
|
||||||
scrollToTop = function(t) {
|
|
||||||
var distance, speed, step, steps, timer, speed_step;
|
|
||||||
|
|
||||||
// Ensure that the #wpadminbar was the target of the click.
|
|
||||||
if ( t.id != 'wpadminbar' && t.id != 'wp-admin-bar-top-secondary' )
|
|
||||||
return;
|
|
||||||
|
|
||||||
distance = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0;
|
|
||||||
|
|
||||||
if ( distance < 1 )
|
|
||||||
return;
|
|
||||||
|
|
||||||
speed_step = distance > 800 ? 130 : 100;
|
|
||||||
speed = Math.min( 12, Math.round( distance / speed_step ) );
|
|
||||||
step = distance > 800 ? Math.round( distance / 30 ) : Math.round( distance / 20 );
|
|
||||||
steps = [];
|
|
||||||
timer = 0;
|
|
||||||
|
|
||||||
// Animate scrolling to the top of the page by generating steps to
|
|
||||||
// the top of the page and shifting to each step at a set interval.
|
|
||||||
while ( distance ) {
|
|
||||||
distance -= step;
|
|
||||||
if ( distance < 0 )
|
|
||||||
distance = 0;
|
|
||||||
steps.push( distance );
|
|
||||||
|
|
||||||
setTimeout( function() {
|
|
||||||
window.scrollTo( 0, steps.shift() );
|
|
||||||
}, timer * speed );
|
|
||||||
|
|
||||||
timer++;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
addEvent(w, 'load', function() {
|
|
||||||
aB = d.getElementById('wpadminbar');
|
|
||||||
|
|
||||||
if ( d.body && aB ) {
|
|
||||||
d.body.appendChild( aB );
|
|
||||||
|
|
||||||
if ( aB.className )
|
|
||||||
aB.className = aB.className.replace(/nojs/, '');
|
|
||||||
|
|
||||||
addEvent(aB, 'mouseover', function(e) {
|
|
||||||
addHoverClass( e.target || e.srcElement );
|
|
||||||
});
|
|
||||||
|
|
||||||
addEvent(aB, 'mouseout', function(e) {
|
|
||||||
removeHoverClass( e.target || e.srcElement );
|
|
||||||
});
|
|
||||||
|
|
||||||
addEvent(aB, 'click', clickShortlink );
|
|
||||||
|
|
||||||
addEvent(aB, 'click', function(e) {
|
|
||||||
scrollToTop( e.target || e.srcElement );
|
|
||||||
});
|
|
||||||
|
|
||||||
addEvent( document.getElementById('wp-admin-bar-logout'), 'click', function() {
|
|
||||||
if ( 'sessionStorage' in window ) {
|
|
||||||
try {
|
|
||||||
for ( var key in sessionStorage ) {
|
|
||||||
if ( key.indexOf('wp-autosave-') != -1 )
|
|
||||||
sessionStorage.removeItem(key);
|
|
||||||
}
|
|
||||||
} catch(e) {}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( w.location.hash )
|
|
||||||
w.scrollBy(0,-32);
|
|
||||||
|
|
||||||
if ( navigator.userAgent && document.body.className.indexOf( 'no-font-face' ) === -1 &&
|
|
||||||
/Android (1.0|1.1|1.5|1.6|2.0|2.1)|Nokia|Opera Mini|w(eb)?OSBrowser|webOS|UCWEB|Windows Phone OS 7|XBLWP7|ZuneWP7|MSIE 7/.test( navigator.userAgent ) ) {
|
|
||||||
|
|
||||||
document.body.className += ' no-font-face';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
})(document, window);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -0,0 +1 @@
|
||||||
|
!function(e,t){if("function"==typeof define&&define.amd)define("hoverintent",["module"],t);else if("undefined"!=typeof exports)t(module);else{var n={exports:{}};t(n),e.hoverintent=n.exports}}(this,function(e){"use strict";var t=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o])}return e};e.exports=function(e,n,o){function i(e,t){return y&&(y=clearTimeout(y)),b=0,p?void 0:o.call(e,t)}function r(e){m=e.clientX,d=e.clientY}function u(e,t){if(y&&(y=clearTimeout(y)),Math.abs(h-m)+Math.abs(E-d)<x.sensitivity)return b=1,p?void 0:n.call(e,t);h=m,E=d,y=setTimeout(function(){u(e,t)},x.interval)}function s(t){return L=!0,y&&(y=clearTimeout(y)),e.removeEventListener("mousemove",r,!1),1!==b&&(h=t.clientX,E=t.clientY,e.addEventListener("mousemove",r,!1),y=setTimeout(function(){u(e,t)},x.interval)),this}function c(t){return L=!1,y&&(y=clearTimeout(y)),e.removeEventListener("mousemove",r,!1),1===b&&(y=setTimeout(function(){i(e,t)},x.timeout)),this}function v(t){L||(p=!0,n.call(e,t))}function a(t){!L&&p&&(p=!1,o.call(e,t))}function f(){e.addEventListener("focus",v,!1),e.addEventListener("blur",a,!1)}function l(){e.removeEventListener("focus",v,!1),e.removeEventListener("blur",a,!1)}var m,d,h,E,L=!1,p=!1,T={},b=0,y=0,x={sensitivity:7,interval:100,timeout:0,handleFocus:!1};return T.options=function(e){var n=e.handleFocus!==x.handleFocus;return x=t({},x,e),n&&(x.handleFocus?f():l()),T},T.remove=function(){e&&(e.removeEventListener("mouseover",s,!1),e.removeEventListener("mouseout",c,!1),l())},e&&(e.addEventListener("mouseover",s,!1),e.addEventListener("mouseout",c,!1)),T}});
|
|
@ -1490,7 +1490,7 @@ function wp_default_scripts( &$scripts ) {
|
||||||
|
|
||||||
$scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
|
$scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
|
||||||
|
|
||||||
$scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );
|
$scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array( 'hoverintent-js' ), false, 1 );
|
||||||
|
|
||||||
$scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
|
$scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
|
||||||
did_action( 'init' ) && $scripts->localize(
|
did_action( 'init' ) && $scripts->localize(
|
||||||
|
@ -1515,6 +1515,9 @@ function wp_default_scripts( &$scripts ) {
|
||||||
|
|
||||||
$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array( 'jquery' ), '1.8.1', 1 );
|
$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array( 'jquery' ), '1.8.1', 1 );
|
||||||
|
|
||||||
|
// JS-only version of hoverintent (no dependencies).
|
||||||
|
$scripts->add( 'hoverintent-js', "/wp-includes/js/hoverintent-js.min.js", array(), '2.2.1', 1 );
|
||||||
|
|
||||||
$scripts->add( 'customize-base', "/wp-includes/js/customize-base$suffix.js", array( 'jquery', 'json2', 'underscore' ), false, 1 );
|
$scripts->add( 'customize-base', "/wp-includes/js/customize-base$suffix.js", array( 'jquery', 'json2', 'underscore' ), false, 1 );
|
||||||
$scripts->add( 'customize-loader', "/wp-includes/js/customize-loader$suffix.js", array( 'customize-base' ), false, 1 );
|
$scripts->add( 'customize-loader', "/wp-includes/js/customize-loader$suffix.js", array( 'customize-base' ), false, 1 );
|
||||||
$scripts->add( 'customize-preview', "/wp-includes/js/customize-preview$suffix.js", array( 'wp-a11y', 'customize-base' ), false, 1 );
|
$scripts->add( 'customize-preview', "/wp-includes/js/customize-preview$suffix.js", array( 'wp-a11y', 'customize-base' ), false, 1 );
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '5.3.1-alpha-46871';
|
$wp_version = '5.3.1-alpha-46873';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue