X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fevent.js;h=0128dc5999ddefe5aa68d46a05ef8f0f453050a6;hb=01f72026ec939e87da85a7afc1a5262872ea3ce5;hp=fb28cb904e499e0d05c3cc00599851201a49124d;hpb=199a721103b17c18dea7a9abaeb79866ef4a7f51;p=jquery.git diff --git a/src/event.js b/src/event.js index fb28cb9..0128dc5 100644 --- a/src/event.js +++ b/src/event.js @@ -670,9 +670,9 @@ function testChange( e ) { jQuery.data( elem, "_change_data", val ); } - if ( elem.type !== "select" && (data != null || val) ) { + if ( data != null || val ) { e.type = "change"; - return jQuery.event.trigger( e, arguments[1], this ); + return jQuery.event.trigger( e, arguments[1], elem ); } } @@ -838,32 +838,52 @@ jQuery.fn.extend({ hover: function( fnOver, fnOut ) { return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); - }, + } +}); + +jQuery.each(["live", "die"], function( i, name ) { + jQuery.fn[ name ] = function( types, data, fn ) { + var type, i = 0; - live: function( type, data, fn ) { if ( jQuery.isFunction( data ) ) { fn = data; data = undefined; } - jQuery( this.context ).bind( liveConvert( type, this.selector ), { - data: data, selector: this.selector, live: type - }, fn ); + types = types.split( /\s+/ ); - return this; - }, + while ( (type = types[ i++ ]) ) { + type = type === "focus" ? "focusin" : // focus --> focusin + type === "blur" ? "focusout" : // blur --> focusout + type === "hover" ? types.push("mouseleave") && "mouseenter" : // hover support + type; + + if ( name === "live" ) { + // bind live handler + jQuery( this.context ).bind( liveConvert( type, this.selector ), { + data: data, selector: this.selector, live: type + }, fn ); - die: function( type, fn ) { - jQuery( this.context ).unbind( liveConvert( type, this.selector ), fn ? { guid: fn.guid + this.selector + type } : null ); + } else { + // unbind live handler + jQuery( this.context ).unbind( liveConvert( type, this.selector ), fn ? { guid: fn.guid + this.selector + type } : null ); + } + } + return this; } }); function liveHandler( event ) { - var stop = true, elems = [], selectors = [], args = arguments, - related, match, fn, elem, j, i, data, + var stop, elems = [], selectors = [], args = arguments, + related, match, fn, elem, j, i, l, data, live = jQuery.extend({}, jQuery.data( this, "events" ).live); + // Make sure we avoid non-left-click bubbling in Firefox (#3861) + if ( event.button && event.type === "click" ) { + return; + } + for ( j in live ) { fn = live[j]; if ( fn.live === event.type ||