X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fevent%2Fevent.js;h=2d9c53056e9765ae49fc4000a87535796f8419ee;hb=11b64c1149a0d49d105b50a2869d74cbe18613ed;hp=3834fd65f53e21c41971dff4a6621510c12f5cb7;hpb=1d2faf36cf356bc09d3389ad6fce6ee520560f25;p=jquery.git diff --git a/src/event/event.js b/src/event/event.js index 3834fd6..2d9c530 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -14,7 +14,7 @@ jQuery.event = { element = window; // if data is passed, bind to handler - if( data != undefined ) { + if( data != handler ) { // Create temporary function pointer to original handler var fn = handler; @@ -55,7 +55,7 @@ jQuery.event = { if (element.addEventListener) element.addEventListener(type, element.$handle, false); else if (element.attachEvent) - element.attachEvent("on" + type, element.$handle, false); + element.attachEvent("on" + type, element.$handle); } // Add the function to the element's handler list @@ -101,7 +101,7 @@ jQuery.event = { if (element.removeEventListener) element.removeEventListener(type, element.$handle, false); else if (element.detachEvent) - element.detachEvent("on" + type, element.$handle, false); + element.detachEvent("on" + type, element.$handle); ret = null; delete events[type]; } @@ -274,7 +274,7 @@ jQuery.fn.extend({ */ bind: function( type, data, fn ) { return this.each(function(){ - jQuery.event.add( this, type, fn || data, data ); + jQuery.event.add( this, type, fn || data, fn && data ); }); }, @@ -309,7 +309,7 @@ jQuery.fn.extend({ jQuery.event.add( this, type, function(event) { jQuery(this).unbind(event); return (fn || data).apply( this, arguments); - }, data); + }, fn && data); }); },