Changeset 19605

Timestamp:

12/20/2011 08:54:54 PM (11 years ago)

Author:

nacin

Message:

hoverIntent r6. fixes #19311.

Location:

trunk/wp-includes/js

Files:

• hoverIntent.dev.js (modified) (5 diffs)
• hoverIntent.js (modified) (1 diff)

trunk/wp-includes/js/hoverIntent.dev.js

@@ -5 +5 @@
 * threshold) before firing the onMouseOver event.
 * 
-* hoverIntent r5 // 2007.03.27 // jQuery 1.1.2+
+* hoverIntent r6 // 2011.02.26 // jQuery 1.5.1+
 * <http://cherne.net/brian/resources/jquery.hoverIntent.html>
 * 
@@ -26 +26 @@
 * @param  f  onMouseOver function || An object with configuration options
 * @param  g  onMouseOut function  || Nothing (use configuration options object)
-* @author    Brian Cherne <brian@cherne.net>
+* @author    Brian Cherne brian(at)cherne(dot)net
 */
 (function($) {
@@ -73 +73 @@
             return cfg.out.apply(ob,[ev]);
         };
-        
-        // workaround for Mozilla bug: not firing mouseout/mouseleave on absolute positioned elements over textareas and input type="text"
-        var handleHover = function(e) {
-            var t = this;
-            
-            // next two lines copied from jQuery.hover, ignore children onMouseOver/onMouseOut
-            var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
-            while ( p && p != this ) { try { p = p.parentNode; } catch(e) { p = this; } }
-            if ( p == this ) {
-                if ( $.browser.mozilla ) {
-                    if ( e.type == "mouseout" ) {
-                        t.mtout = setTimeout( function(){doHover(e,t);}, 30 );
-                    } else {
-                        if (t.mtout) { t.mtout = clearTimeout(t.mtout); }
-                    }
-                }
-                return;
-            } else {
-                if (t.mtout) { t.mtout = clearTimeout(t.mtout); }
-                doHover(e,t);
-            }
-        };
 
         // A private function for handling mouse 'hovering'
-        var doHover = function(e,ob) {
-
+        var handleHover = function(e) {
             // copy objects to be passed into t (required for event object to be passed in IE)
             var ev = jQuery.extend({},e);
+            var ob = this;
 
             // cancel hoverIntent timer if it exists
             if (ob.hoverIntent_t) { ob.hoverIntent_t = clearTimeout(ob.hoverIntent_t); }
 
-            // else e.type == "onmouseover"
-            if (e.type == "mouseover") {
+            // if e.type == "mouseenter"
+            if (e.type == "mouseenter") {
                 // set "previous" X and Y position based on initial entry point
                 pX = ev.pageX; pY = ev.pageY;
@@ -114 +92 @@
                 if (ob.hoverIntent_s != 1) { ob.hoverIntent_t = setTimeout( function(){compare(ev,ob);} , cfg.interval );}
 
-            // else e.type == "onmouseout"
+            // else e.type == "mouseleave"
             } else {
                 // unbind expensive mousemove event
@@ -124 +102 @@
 
         // bind the function to the two event listeners
-        return this.mouseover(handleHover).mouseout(handleHover);
+        return this.bind('mouseenter',handleHover).bind('mouseleave',handleHover);
     };
 })(jQuery);

trunk/wp-includes/js/hoverIntent.js

@@ -1 @@
-(function(a){a.fn.hoverIntent=function(l,j){var m={sensitivity:7,interval:100,timeout:0};m=a.extend(m,j?{over:l,out:j}:l);var o,n,h,d;var e=function(f){o=f.pageX;n=f.pageY};var c=function(g,f){f.hoverIntent_t=clearTimeout(f.hoverIntent_t);if((Math.abs(h-o)+Math.abs(d-n))<m.sensitivity){a(f).unbind("mousemove",e);f.hoverIntent_s=1;return m.over.apply(f,[g])}else{h=o;d=n;f.hoverIntent_t=setTimeout(function(){c(g,f)},m.interval)}};var i=function(g,f){f.hoverIntent_t=clearTimeout(f.hoverIntent_t);f.hoverIntent_s=0;return m.out.apply(f,[g])};var b=function(q){var f=this;var g=(q.type=="mouseover"?q.fromElement:q.toElement)||q.relatedTarget;while(g&&g!=this){try{g=g.parentNode}catch(q){g=this}}if(g==this){if(a.browser.mozilla){if(q.type=="mouseout"){f.mtout=setTimeout(function(){k(q,f)},30)}else{if(f.mtout){f.mtout=clearTimeout(f.mtout)}}}return}else{if(f.mtout){f.mtout=clearTimeout(f.mtout)}k(q,f)}};var k=function(p,f){var g=jQuery.extend({},p);if(f.hoverIntent_t){f.hoverIntent_t=clearTimeout(f.hoverIntent_t)}if(p.type=="mouseover"){h=g.pageX;d=g.pageY;a(f).bind("mousemove",e);if(f.hoverIntent_s!=1){f.hoverIntent_t=setTimeout(function(){c(g,f)},m.interval)}}else{a(f).unbind("mousemove",e);if(f.hoverIntent_s==1){f.hoverIntent_t=setTimeout(function(){i(g,f)},m.timeout)}}};return this.mouseover(b).mouseout(b)}})(jQuery);
+(function($){$.fn.hoverIntent=function(f,g){var cfg={sensitivity:7,interval:100,timeout:0};cfg=$.extend(cfg,g?{over:f,out:g}:f);var cX,cY,pX,pY;var track=function(ev){cX=ev.pageX;cY=ev.pageY};var compare=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);if((Math.abs(pX-cX)+Math.abs(pY-cY))<cfg.sensitivity){$(ob).unbind("mousemove",track);ob.hoverIntent_s=1;return cfg.over.apply(ob,[ev])}else{pX=cX;pY=cY;ob.hoverIntent_t=setTimeout(function(){compare(ev,ob)},cfg.interval)}};var delay=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);ob.hoverIntent_s=0;return cfg.out.apply(ob,[ev])};var handleHover=function(e){var ev=jQuery.extend({},e);var ob=this;if(ob.hoverIntent_t){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t)}if(e.type=="mouseenter"){pX=ev.pageX;pY=ev.pageY;$(ob).bind("mousemove",track);if(ob.hoverIntent_s!=1){ob.hoverIntent_t=setTimeout(function(){compare(ev,ob)},cfg.interval)}}else{$(ob).unbind("mousemove",track);if(ob.hoverIntent_s==1){ob.hoverIntent_t=setTimeout(function(){delay(ev,ob)},cfg.timeout)}}};return this.bind('mouseenter',handleHover).bind('mouseleave',handleHover)}})(jQuery);