X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=921e524276caabc18a9523b9002cd2153dc98523;hb=f1c91fd023ad0bbd01a386bca4d8503e0e27df73;hp=3610122a85b147e760d4cd715b9789c9ccc2f2ba;hpb=cc5625067a6bb75d357181cf6483ae0ab367c73f;p=jquery.git diff --git a/src/event/event.js b/src/event/event.js index 3610122..921e524 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -16,13 +16,6 @@ jQuery.fn.extend({ * $(this).removeClass("selected"); * }); * - * @test var count = 0; - * var fn1 = function() { count++; } - * var fn2 = function() { count--; } - * var link = $('#mark'); - * link.click().toggle(fn1, fn2).click().click().click().click().click(); - * ok( count == 1, "Check for toggle(fn, fn)" ); - * * @name toggle * @type jQuery * @param Function even The function to execute on every even click. @@ -80,7 +73,7 @@ jQuery.fn.extend({ var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget; // Traverse up the tree - while ( p && p != this ) p = p.parentNode; + while ( p && p != this ) try { p = p.parentNode } catch(e) { p = this; }; // If we actually just moused on to a sub-element, ignore it if ( p == this ) return false; @@ -107,6 +100,8 @@ jQuery.fn.extend({ * Please ensure you have no code in your <body> onload event handler, * otherwise $(document).ready() may not fire. * + * You can have as many $(document).ready events on your page as you like. + * * @example $(document).ready(function(){ Your code here... }); * * @name ready @@ -153,6 +148,9 @@ jQuery.extend({ // Reset the list of functions jQuery.readyList = null; } + // Remove event lisenter to avoid memory leak + if ( jQuery.browser.mozilla || jQuery.browser.opera ) + document.removeEventListener( "DOMContentLoaded", jQuery.ready, false ); } } }); @@ -720,11 +718,15 @@ new function(){ * Trigger the load event of each matched element. This causes all of the functions * that have been bound to thet load event to be executed. * + * Marked as private: Calling load() without arguments throws exception because the ajax load + * does not handle it. + * * @example $("p").load(); * @before

Hello

* @result alert('Hello'); * * @name load + * @private * @type jQuery * @cat Events/Browser */ @@ -1518,50 +1520,6 @@ new function(){ * @type jQuery * @cat Events/Mouse */ - - /** - * @test var count; - * // ignore load - * var e = ("blur,focus,resize,scroll,unload,click,dblclick," + - * "mousedown,mouseup,mousemove,mouseover,mouseout,change,reset,select," + - * "submit,keydown,keypress,keyup,error").split(","); - * var handler1 = function(event) { - * count++; - * }; - * var handler2 = function(event) { - * count++; - * }; - * for( var i=0; i < e.length; i++) { - * var event = e[i]; - * count = 0; - * // bind handler - * $(document)[event](handler1); - * $(document)[event](handler2); - * $(document)["one"+event](handler1); - * - * // call event two times - * $(document)[event](); - * $(document)[event](); - * - * // unbind events - * $(document)["un"+event](handler1); - * // call once more - * $(document)[event](); - * - * // remove all handlers - * $(document)["un"+event](); - * - * // call once more - * $(document)[event](); - * - * // assert count - * ok( count == 6, 'Checking event ' + event); - * } - * - * @private - * @name eventTesting - * @cat Events - */ var e = ("blur,focus,load,resize,scroll,unload,click,dblclick," + "mousedown,mouseup,mousemove,mouseover,mouseout,change,reset,select," + @@ -1583,20 +1541,16 @@ new function(){ // Finally, handle events that only fire once jQuery.fn["one"+o] = function(f){ - // Attach the event listener - return this.each(function(){ - - var count = 0; - - // Add the event - jQuery.event.add( this, o, function(e){ - // If this function has already been executed, stop - if ( count++ ) return; - - // And execute the bound function - return f.apply(this, [e]); - }); - }); + // save cloned reference to this + var element = jQuery(this); + var handler = function() { + // unbind itself when executed + element.unbind(o, handler); + element = null; + // apply original handler with the same arguments + f.apply(this, arguments); + }; + return this.bind(o, handler); }; }; @@ -1616,11 +1570,12 @@ new function(){ // Use the defer script hack var script = document.getElementById("__ie_init"); - script.onreadystatechange = function() { - if ( this.readyState != "complete" ) return; - this.parentNode.removeChild( this ); - jQuery.ready(); - }; + if (script) // script does not exist if jQuery is loaded dynamically + script.onreadystatechange = function() { + if ( this.readyState != "complete" ) return; + this.parentNode.removeChild( this ); + jQuery.ready(); + }; // Clear from memory script = null; @@ -1649,10 +1604,10 @@ new function(){ }; // Clean up after IE to avoid memory leaks -if ($.browser.msie) $(window).unload(function() { +if (jQuery.browser.msie) jQuery(window).unload(function() { var event = jQuery.event, global = event.global; for (var type in global) { var els = global[type], i = els.length; - if (i>0) do event.remove(els[i-1], type); while (--i); + if (i>0) do if (type != 'unload') event.remove(els[i-1], type); while (--i); } });