git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
859aa6c
)
Cleaned up mouseenter and mouseleave special events
author
Brandon Aaron
<brandon.aaron@gmail.com>
Sun, 16 Dec 2007 22:18:35 +0000
(22:18 +0000)
committer
Brandon Aaron
<brandon.aaron@gmail.com>
Sun, 16 Dec 2007 22:18:35 +0000
(22:18 +0000)
src/event.js
patch
|
blob
|
history
diff --git
a/src/event.js
b/src/event.js
index
0ccbf5d
..
007eb1c
100644
(file)
--- a/
src/event.js
+++ b/
src/event.js
@@
-366,53
+366,45
@@
jQuery.event = {
mouseenter: {
setup: function() {
mouseenter: {
setup: function() {
- if (jQuery.browser.msie) return false;
- jQuery(this).bind('mouseover', jQuery.event.special.mouseenter.handler);
+ if ( jQuery.browser.msie ) return false;
+ jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler);
return true;
},
teardown: function() {
return true;
},
teardown: function() {
- if (jQuery.browser.msie) return false;
- jQuery(this).unbind('mouseover', jQuery.event.special.mouseenter.handler);
+ if ( jQuery.browser.msie ) return false;
+ jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler);
return true;
},
handler: function(event) {
return true;
},
handler: function(event) {
- var args = Array.prototype.slice.call( arguments, 1 );
// If we actually just moused on to a sub-element, ignore it
if ( withinElement(event, this) ) return true;
// Execute the right handlers by setting the event type to mouseenter
// If we actually just moused on to a sub-element, ignore it
if ( withinElement(event, this) ) return true;
// Execute the right handlers by setting the event type to mouseenter
- event.type = 'mouseenter';
- // Include the event object as the first argument
- args.unshift(event);
- var val = jQuery.event.handle.apply(this, args);
- return val;
+ arguments[0].type = "mouseenter";
+ return jQuery.event.handle.apply(this, arguments);
}
},
mouseleave: {
setup: function() {
}
},
mouseleave: {
setup: function() {
- if (jQuery.browser.msie) return false;
- jQuery(this).bind('mouseout', jQuery.event.special.mouseleave.handler);
+ if ( jQuery.browser.msie ) return false;
+ jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler);
return true;
},
teardown: function() {
return true;
},
teardown: function() {
- if (jQuery.browser.msie) return false;
- jQuery(this).unbind('mouseout', jQuery.event.special.mouseleave.handler);
+ if ( jQuery.browser.msie ) return false;
+ jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler);
return true;
},
handler: function(event) {
return true;
},
handler: function(event) {
- var args = Array.prototype.slice.call( arguments, 1 );
// If we actually just moused on to a sub-element, ignore it
if ( withinElement(event, this) ) return true;
// Execute the right handlers by setting the event type to mouseleave
// If we actually just moused on to a sub-element, ignore it
if ( withinElement(event, this) ) return true;
// Execute the right handlers by setting the event type to mouseleave
- event.type = 'mouseleave';
- // Include the event object as the first argument
- args.unshift(event);
- var val = jQuery.event.handle.apply(this, args);
- return val;
+ arguments[0].type = "mouseleave";
+ return jQuery.event.handle.apply(this, arguments);
}
}
}
}
}
}