Ticket #25970: 25970.diff

src/wp-includes/js/admin-bar.js

@@ +1 @@
+/* jshint loopfunc: true */
 // use jQuery and hoverIntent if loaded
 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);
+                /* jshint ignore:end */
         }
         jQuery(document).ready(function($){
                 var adminbar = $('#wpadminbar'), refresh, touchOpen, touchClose, disableHoverIntent = false;
@@ -53 +56 @@
                 }
 
                 adminbar.find('li.menupop').hoverIntent({
-                        over: function(e){
+                        over: function() {
                                 if ( disableHoverIntent )
                                         return;
 
                                 $(this).addClass('hover');
                         },
-                        out: function(e){
+                        out: function() {
                                 if ( disableHoverIntent )
                                         return;
 
@@ -120 +123 @@
 
                 // fix focus bug in WebKit
                 $('.screen-reader-shortcut').keydown( function(e) {
+                        var id, ua;
+
                         if ( 13 != e.which )
                                 return;
 
-                        var id = $(this).attr('href');
+                        id = $( this ).attr( 'href' );
 
-                        var ua = navigator.userAgent.toLowerCase();
+                        ua = navigator.userAgent.toLowerCase();
+
                         if ( ua.indexOf('applewebkit') != -1 && id && id.charAt(0) == '#' ) {
                                 setTimeout(function () {
                                         $(id).focus();