X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=330e05adceddeddb646740b5e286fd2086cc1381;hb=bfdf836da9cf5d0ebd1d6a50c0174bb5b3922d52;hp=025dd770bcbf1764a9fb6bc57201b3fbb9d8b5a6;hpb=dd27ea5830e0fb9116642a0e779ea18c31179379;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 025dd77..330e05a 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1960,9 +1960,6 @@ jQuery.extend({ event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data - // If no correct event was found, fail - if ( !event ) return false; - var returnValue = true; var c = this.events[event.type]; @@ -1985,37 +1982,34 @@ jQuery.extend({ }, fix: function(event) { - // check IE - if(jQuery.browser.msie) { - // fix target property, if available - // check prevents overwriting of fake target coming from trigger - if(event.srcElement) - event.target = event.srcElement; - - // calculate pageX/Y + // fix target property, if necessary + if(!event.target && event.srcElement) + event.target = event.srcElement; + + // calculate pageX/Y if missing and clientX/Y available + if(typeof event.pageX == "undefined" && typeof event.clientX != "undefined") { var e = document.documentElement, b = document.body; event.pageX = event.clientX + (e.scrollLeft || b.scrollLeft); event.pageY = event.clientY + (e.scrollTop || b.scrollTop); - + } // check safari and if target is a textnode - } else if(jQuery.browser.safari && event.target.nodeType == 3) { + if(jQuery.browser.safari && event.target.nodeType == 3) { // target is readonly, clone the event object event = jQuery.extend({}, event); // get parentnode from textnode event.target = event.target.parentNode; } - // fix preventDefault and stopPropagation - if (!event.preventDefault) + if (!event.preventDefault) { event.preventDefault = function() { this.returnValue = false; }; - - if (!event.stopPropagation) + } + if (!event.stopPropagation) { event.stopPropagation = function() { this.cancelBubble = true; }; - + } return event; } } @@ -2463,6 +2457,9 @@ jQuery.macros = { /** * Get the html contents of the first matched element. * + * A wrapper for the innerHTML property of DOM elements, therefore + * not available for XML documents. + * * @example $("div").html(); * @before
* @result @@ -2475,6 +2472,9 @@ jQuery.macros = { /** * Set the html contents of every matched element. * + * A wrapper for the innerHTML property of DOM elements, therefore + * not available for XML documents. + * * @example $("div").html("new stuff"); * @before
* @result
new stuff