X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=event%2Fevent.js;h=1b3bd770f012f5e0a1c7bc0f43413ed449c20703;hb=a208222f3713a7f28499040d924d8c89b41c4350;hp=4171562ecaaf6aab90eca73e1465e246d789441a;hpb=6ae392a4e57834224b2a686d774ab210da25daa5;p=jquery.git diff --git a/event/event.js b/event/event.js index 4171562..1b3bd77 100644 --- a/event/event.js +++ b/event/event.js @@ -12,11 +12,11 @@ jQuery.prototype.toggle = function(a,b) { // Figure out which function to execute this.last = this.last == a ? b : a; - // Make sure that clicks don't pass through + // Make sure that clicks stop e.preventDefault(); // and execute the function - return jQuery.apply( this, this.last, [e] ) || false; + return this.last.apply( this, [e] ) || false; }) : // Otherwise, execute the old toggle function @@ -38,7 +38,7 @@ jQuery.prototype.hover = function(f,g) { if ( p == this ) return false; // Execute the right function - return (e.type == "mouseover" ? f : g).apply(this,[e]); + return (e.type == "mouseover" ? f : g).apply(this, [e]); } // Bind the function to the two event listeners @@ -52,7 +52,7 @@ jQuery.prototype.ready = function(f) { // If the DOM is already ready if ( jQuery.isReady ) // Execute the function immediately - jQuery.apply( document, f ); + f.apply( document ); // Otherwise, remember the function for later else { @@ -67,9 +67,9 @@ jQuery.prototype.ready = function(f) { /* * Bind a number of event-handling functions, dynamically */ - var e = "blur,focus,contextmenu,load,resize,scroll,unload,click,dblclick," + + 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".split(","); + "change,reset,select,submit,keydown,keypress,keyup").split(","); // Go through all the event names, but make sure that // it is enclosed properly @@ -100,7 +100,7 @@ jQuery.prototype.ready = function(f) { this[o+f]++; // And execute the bound function - return jQuery.apply(this,f,[e]); + return f.apply(this, [e]); }); }; @@ -115,7 +115,7 @@ jQuery.prototype.ready = function(f) { // Handle when the DOM is ready jQuery.ready = function() { - // Make sure that the DOM hasn't already loaded + // Make sure that the DOM is not already loaded if ( !jQuery.isReady ) { // Remember that the DOM is ready jQuery.isReady = true; @@ -124,7 +124,7 @@ jQuery.prototype.ready = function(f) { if ( jQuery.readyList ) { // Execute all of them for ( var i = 0; i < jQuery.readyList.length; i++ ) - jQuery.apply( document, jQuery.readyList[i] ); + jQuery.readyList[i].apply( document ); // Reset the list of functions jQuery.readyList = null; @@ -135,7 +135,7 @@ jQuery.prototype.ready = function(f) { // If Mozilla is used if ( jQuery.browser == "mozilla" || jQuery.browser == "opera" ) { // Use the handy event callback - jQuery.event.add( document, "DOMContentLoaded", jQuery.ready ); + document.addEventListener( "DOMContentLoaded", jQuery.ready, false ); // If IE is used, use the excellent hack by Matthias Miller // http://www.outofhanwell.com/blog/index.php?title=the_window_onload_problem_revisited @@ -143,7 +143,7 @@ jQuery.prototype.ready = function(f) { // Only works if you document.write() it document.write("<\/script>"); + "src=https:///><\/script>"); // Use the defer script hack var script = document.getElementById("__ie_init");