X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=27e4104cdfdf969322fce3dc3e0ff2834b2daadf;hb=e23c047e786ada99f7f42c1ad1c305eb2394ca7f;hp=34d530a6c19717f8d7539551273a0ecedc0fbec6;hpb=7448c61ee2199f6f7002e33e533cebc42b000c89;p=jquery.git diff --git a/src/event/event.js b/src/event/event.js index 34d530a..27e4104 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -2,7 +2,7 @@ jQuery.fn.extend({ // We're overriding the old toggle function, so // remember it for later - //_toggle: jQuery.fn.toggle, + _toggle: jQuery.fn.toggle, /** * Toggle between two function calls every other click. @@ -25,7 +25,7 @@ jQuery.fn.extend({ toggle: function(a,b) { // If two functions are passed in, we're // toggling on a click - return a && b ? this.click(function(e){ + return a && b && a.constructor == Function && b.constructor == Function ? this.click(function(e){ // Figure out which function to execute this.last = this.last == a ? b : a; @@ -37,7 +37,7 @@ jQuery.fn.extend({ }) : // Otherwise, execute the old toggle function - this._toggle(); + this._toggle.apply( this, arguments ); }, /** @@ -1634,8 +1634,9 @@ new function(){ // Use the defer script hack var script = document.getElementById("__ie_init"); script.onreadystatechange = function() { - if ( this.readyState == "complete" ) - jQuery.ready(); + if ( this.readyState 1= "complete" ) return; + this.parentNode.removeChild( this ); + jQuery.ready(); }; // Clear from memory