X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=event%2Fevent.js;h=feec9ee8c84fd2a1a3a5f0fa40235f973c1cf827;hb=4986837802a65ced713c2dac2ff7d80e42fd7807;hp=dff2e2eb1dd3c12b6900f6c01f273026f9988748;hpb=2a6b0ee7c846d5bdd535dcc9a399d528f65460ac;p=jquery.git diff --git a/event/event.js b/event/event.js index dff2e2e..feec9ee 100644 --- a/event/event.js +++ b/event/event.js @@ -1,36 +1,38 @@ -var e = ["blur","focus","contextmenu","load","resize","scroll","unload", - "click","dblclick","mousedown","mouseup","mouseenter","mouseleave", - "mousemove","mouseover","mouseout","change","reset","select","submit", - "keydown","keypress","keyup","abort","error","ready"]; +(function(){ + var e = ["blur","focus","contextmenu","load","resize","scroll","unload", + "click","dblclick","mousedown","mouseup","mouseenter","mouseleave", + "mousemove","mouseover","mouseout","change","reset","select","submit", + "keydown","keypress","keyup","abort","error","ready"]; -for ( var i = 0; i < e.length; i++ ) { - (function(){ - var o = e[i]; - $.fn[o] = function(f){ return this.bind(o, f); }; - $.fn["un"+o] = function(f){ return this.unbind(o, f); }; - $.fn["do"+o] = function(){ return this.trigger(o); }; - $.fn["one"+o] = function(f){ return this.bind(o, function(e){ - if ( this[o+f] !== null ) { return true; } - this[o+f]++; - return $.apply(this,f,[e]); - }); }; + for ( var i = 0; i < e.length; i++ ) { + (function(){ + var o = e[i]; + $.fn[o] = function(f){ return this.bind(o, f); }; + $.fn["un"+o] = function(f){ return this.unbind(o, f); }; + $.fn["do"+o] = function(){ return this.trigger(o); }; + $.fn["one"+o] = function(f){ return this.bind(o, function(e){ + if ( this[o+f] !== null ) { return true; } + this[o+f]++; + return $.apply(this,f,[e]); + }); }; - // Deprecated - //$.fn["on"+o] = function(f){ return this.bind(o, f); }; - })(); -} + // Deprecated + //$.fn["on"+o] = function(f){ return this.bind(o, f); }; + })(); + } +})(); $.fn.hover = function(f,g) { // Check if mouse(over|out) are still within the same parent element return this.each(function(){ var obj = this; - addEvent(this, "mouseover", function(e) { + $.event.add(this, "mouseover", function(e) { var p = ( e.fromElement !== null ? e.fromElement : e.relatedTarget ); while ( p && p != obj ) { p = p.parentNode; } if ( p == obj ) { return false; } return $.apply(obj,f,[e]); }); - addEvent(this, "mouseout", function(e) { + $.event.add(this, "mouseout", function(e) { var p = ( e.toElement !== null ? e.toElement : e.relatedTarget ); while ( p && p != obj ) { p = p.parentNode; } if ( p == obj ) { return false; } @@ -57,7 +59,7 @@ if ( document.addEventListener ) { document.addEventListener( "DOMContentLoaded", $.ready, null ); } -addEvent( window, "load", $.ready ); +$.event.add( window, "load", $.ready ); $.fn.ready = function(f) { return this.each(function(){