Fix for #186 and for jQuery.event.fix

This commit is contained in:
Brandon Aaron 2006-11-02 14:43:20 +00:00
parent 40b55adf5c
commit ddd110c9e5

26
src/jquery/jquery.js vendored
View file

@ -2271,7 +2271,7 @@ jQuery.extend({
handle: function(event) { handle: function(event) {
if ( typeof jQuery == "undefined" ) return false; if ( typeof jQuery == "undefined" ) return false;
event = event || jQuery.event.fix( window.event ); event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data
// If no correct event was found, fail // If no correct event was found, fail
if ( !event ) return false; if ( !event ) return false;
@ -2291,16 +2291,18 @@ jQuery.extend({
} }
} }
// Clean up added properties in IE to prevent memory leak
if (jQuery.browser.msie) event.target = event.preventDefault = event.stopPropagation = null;
return returnValue; return returnValue;
}, },
fix: function(event) { fix: function(event) {
// check IE // check IE
if(jQuery.browser.msie) { if(jQuery.browser.msie) {
// get real event from window.event
event = window.event;
// fix target property // fix target property
event.target = event.srcElement; event.target = event.srcElement;
// check safari and if target is a textnode // check safari and if target is a textnode
} else if(jQuery.browser.safari && event.target.nodeType == 3) { } else if(jQuery.browser.safari && event.target.nodeType == 3) {
// target is readonly, clone the event object // target is readonly, clone the event object
@ -2308,16 +2310,20 @@ jQuery.extend({
// get parentnode from textnode // get parentnode from textnode
event.target = event.target.parentNode; event.target = event.target.parentNode;
} }
// fix preventDefault and stopPropagation // fix preventDefault and stopPropagation
event.preventDefault = function() { if (!event.preventDefault)
this.returnValue = false; event.preventDefault = function() {
}; this.returnValue = false;
event.stopPropagation = function() { };
this.cancelBubble = true;
}; if (!event.stopPropagation)
event.stopPropagation = function() {
this.cancelBubble = true;
};
return event; return event;
} }
} }
}); });