X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..7f1521bf193b382565eb753043c161f4cb3fcda7:/wp-includes/js/admin-bar.js

diff --git a/wp-includes/js/admin-bar.js b/wp-includes/js/admin-bar.js
index 912485c6..c028db9d 100644
--- a/wp-includes/js/admin-bar.js
+++ b/wp-includes/js/admin-bar.js
@@ -3,8 +3,8 @@
 if ( typeof(jQuery) != 'undefined' ) {
 	if ( typeof(jQuery.fn.hoverIntent) == 'undefined' ) {
 		/* jshint ignore:start */
-		// hoverIntent r6 - Copy of wp-includes/js/hoverIntent.min.js
-		(function(a){a.fn.hoverIntent=function(m,d,h){var j={interval:100,sensitivity:7,timeout:0};if(typeof m==="object"){j=a.extend(j,m)}else{if(a.isFunction(d)){j=a.extend(j,{over:m,out:d,selector:h})}else{j=a.extend(j,{over:m,out:m,selector:d})}}var l,k,g,f;var e=function(n){l=n.pageX;k=n.pageY};var c=function(o,n){n.hoverIntent_t=clearTimeout(n.hoverIntent_t);if((Math.abs(g-l)+Math.abs(f-k))<j.sensitivity){a(n).off("mousemove.hoverIntent",e);n.hoverIntent_s=1;return j.over.apply(n,[o])}else{g=l;f=k;n.hoverIntent_t=setTimeout(function(){c(o,n)},j.interval)}};var i=function(o,n){n.hoverIntent_t=clearTimeout(n.hoverIntent_t);n.hoverIntent_s=0;return j.out.apply(n,[o])};var b=function(p){var o=jQuery.extend({},p);var n=this;if(n.hoverIntent_t){n.hoverIntent_t=clearTimeout(n.hoverIntent_t)}if(p.type=="mouseenter"){g=o.pageX;f=o.pageY;a(n).on("mousemove.hoverIntent",e);if(n.hoverIntent_s!=1){n.hoverIntent_t=setTimeout(function(){c(o,n)},j.interval)}}else{a(n).off("mousemove.hoverIntent",e);if(n.hoverIntent_s==1){n.hoverIntent_t=setTimeout(function(){i(o,n)},j.timeout)}}};return this.on({"mouseenter.hoverIntent":b,"mouseleave.hoverIntent":b},j.selector)}})(jQuery);
+		// 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);
 		/* jshint ignore:end */
 	}
 	jQuery(document).ready(function($){
@@ -91,7 +91,9 @@ if ( typeof(jQuery) != 'undefined' ) {
 			if ( e.which != 13 )
 				return;
 
-			var target = $(e.target), wrap = target.closest('ab-sub-wrapper');
+			var target = $(e.target),
+				wrap = target.closest('.ab-sub-wrapper'),
+				parentHasHover = target.parent().hasClass('hover');
 
 			e.stopPropagation();
 			e.preventDefault();
@@ -100,7 +102,11 @@ if ( typeof(jQuery) != 'undefined' ) {
 				wrap = $('#wpadminbar .quicklinks');
 
 			wrap.find('.menupop').removeClass('hover');
-			target.parent().toggleClass('hover');
+
+			if ( ! parentHasHover ) {
+				target.parent().toggleClass('hover');
+			}
+
 			target.siblings('.ab-sub-wrapper').find('.ab-item').each(refresh);
 		}).each(refresh);
 
@@ -143,6 +149,14 @@ if ( typeof(jQuery) != 'undefined' ) {
 			}
 		});
 
+		$( '#adminbar-search' ).on({
+			focus: function() {
+				$( '#adminbarsearch' ).addClass( 'adminbar-focused' );
+			}, blur: function() {
+				$( '#adminbarsearch' ).removeClass( 'adminbar-focused' );
+			}
+		} );
+
 		// Empty sessionStorage on logging out
 		if ( 'sessionStorage' in window ) {
 			$('#wp-admin-bar-logout a').click( function() {