Retooled the arguments.callee-related changes in 98ce35d52b
to avoid re-declarations where possible.
This commit is contained in:
parent
fe9333cc79
commit
9997620420
2 changed files with 57 additions and 31 deletions
77
src/core.js
77
src/core.js
|
@ -41,6 +41,9 @@ var jQuery = function( selector, context ) {
|
||||||
// The functions to execute on DOM ready
|
// The functions to execute on DOM ready
|
||||||
readyList = [],
|
readyList = [],
|
||||||
|
|
||||||
|
// The ready event handler
|
||||||
|
DOMContentLoaded,
|
||||||
|
|
||||||
// Save a reference to some core methods
|
// Save a reference to some core methods
|
||||||
toString = Object.prototype.toString,
|
toString = Object.prototype.toString,
|
||||||
hasOwnProperty = Object.prototype.hasOwnProperty,
|
hasOwnProperty = Object.prototype.hasOwnProperty,
|
||||||
|
@ -347,6 +350,7 @@ jQuery.extend({
|
||||||
ready: function() {
|
ready: function() {
|
||||||
// Make sure that the DOM is not already loaded
|
// Make sure that the DOM is not already loaded
|
||||||
if ( !jQuery.isReady ) {
|
if ( !jQuery.isReady ) {
|
||||||
|
// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
|
||||||
if ( !document.body ) {
|
if ( !document.body ) {
|
||||||
return setTimeout( jQuery.ready, 13 );
|
return setTimeout( jQuery.ready, 13 );
|
||||||
}
|
}
|
||||||
|
@ -386,10 +390,7 @@ jQuery.extend({
|
||||||
// Mozilla, Opera and webkit nightlies currently support this event
|
// Mozilla, Opera and webkit nightlies currently support this event
|
||||||
if ( document.addEventListener ) {
|
if ( document.addEventListener ) {
|
||||||
// Use the handy event callback
|
// Use the handy event callback
|
||||||
document.addEventListener( "DOMContentLoaded", function DOMContentLoaded() {
|
document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
|
||||||
document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
|
|
||||||
jQuery.ready();
|
|
||||||
}, false );
|
|
||||||
|
|
||||||
// A fallback to window.onload, that will always work
|
// A fallback to window.onload, that will always work
|
||||||
window.addEventListener( "load", jQuery.ready, false );
|
window.addEventListener( "load", jQuery.ready, false );
|
||||||
|
@ -398,13 +399,7 @@ jQuery.extend({
|
||||||
} else if ( document.attachEvent ) {
|
} else if ( document.attachEvent ) {
|
||||||
// ensure firing before onload,
|
// ensure firing before onload,
|
||||||
// maybe late but safe also for iframes
|
// maybe late but safe also for iframes
|
||||||
document.attachEvent("onreadystatechange", function onreadystatechange() {
|
document.attachEvent("onreadystatechange", DOMContentLoaded);
|
||||||
// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
|
|
||||||
if ( document.readyState === "complete" ) {
|
|
||||||
document.detachEvent( "onreadystatechange", onreadystatechange );
|
|
||||||
jQuery.ready();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// A fallback to window.onload, that will always work
|
// A fallback to window.onload, that will always work
|
||||||
window.attachEvent( "onload", jQuery.ready );
|
window.attachEvent( "onload", jQuery.ready );
|
||||||
|
@ -419,24 +414,6 @@ jQuery.extend({
|
||||||
|
|
||||||
if ( document.documentElement.doScroll && toplevel ) {
|
if ( document.documentElement.doScroll && toplevel ) {
|
||||||
doScrollCheck();
|
doScrollCheck();
|
||||||
|
|
||||||
function doScrollCheck() {
|
|
||||||
if ( jQuery.isReady ) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
// If IE is used, use the trick by Diego Perini
|
|
||||||
// http://javascript.nwbox.com/IEContentLoaded/
|
|
||||||
document.documentElement.doScroll("left");
|
|
||||||
} catch( error ) {
|
|
||||||
setTimeout( doScrollCheck, 1 );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// and execute any waiting functions
|
|
||||||
jQuery.ready();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -653,6 +630,48 @@ if ( indexOf ) {
|
||||||
// All jQuery objects should point back to these
|
// All jQuery objects should point back to these
|
||||||
rootjQuery = jQuery(document);
|
rootjQuery = jQuery(document);
|
||||||
|
|
||||||
|
// Cleanup functions for the document ready method
|
||||||
|
if ( document.addEventListener ) {
|
||||||
|
DOMContentLoaded = function() {
|
||||||
|
document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
|
||||||
|
jQuery.ready();
|
||||||
|
};
|
||||||
|
|
||||||
|
} else if ( document.attachEvent ) {
|
||||||
|
DOMContentLoaded = function() {
|
||||||
|
// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
|
||||||
|
if ( document.readyState === "complete" ) {
|
||||||
|
document.detachEvent( "onreadystatechange", DOMContentLoaded );
|
||||||
|
jQuery.ready();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// The DOM ready check for Internet Explorer
|
||||||
|
function doScrollCheck() {
|
||||||
|
if ( jQuery.isReady ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// If IE is used, use the trick by Diego Perini
|
||||||
|
// http://javascript.nwbox.com/IEContentLoaded/
|
||||||
|
document.documentElement.doScroll("left");
|
||||||
|
} catch( error ) {
|
||||||
|
setTimeout( doScrollCheck, 1 );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// and execute any waiting functions
|
||||||
|
jQuery.ready();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( indexOf ) {
|
||||||
|
jQuery.inArray = function( elem, array ) {
|
||||||
|
return indexOf.call( array, elem );
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
function evalScript( i, elem ) {
|
function evalScript( i, elem ) {
|
||||||
if ( elem.src ) {
|
if ( elem.src ) {
|
||||||
jQuery.ajax({
|
jQuery.ajax({
|
||||||
|
|
11
src/event.js
11
src/event.js
|
@ -37,13 +37,20 @@ jQuery.event = {
|
||||||
|
|
||||||
// Init the element's event structure
|
// Init the element's event structure
|
||||||
var events = jQuery.data( elem, "events" ) || jQuery.data( elem, "events", {} ),
|
var events = jQuery.data( elem, "events" ) || jQuery.data( elem, "events", {} ),
|
||||||
handle = jQuery.data( elem, "handle" ) || jQuery.data( elem, "handle", function eventHandle() {
|
handle = jQuery.data( elem, "handle" ), eventHandle;
|
||||||
|
|
||||||
|
if ( !handle ) {
|
||||||
|
eventHandle = function() {
|
||||||
// Handle the second event of a trigger and when
|
// Handle the second event of a trigger and when
|
||||||
// an event is called after a page has unloaded
|
// an event is called after a page has unloaded
|
||||||
return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
|
return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
|
||||||
jQuery.event.handle.apply( eventHandle.elem, arguments ) :
|
jQuery.event.handle.apply( eventHandle.elem, arguments ) :
|
||||||
undefined;
|
undefined;
|
||||||
});
|
};
|
||||||
|
|
||||||
|
handle = jQuery.data( elem, "handle", eventHandle );
|
||||||
|
}
|
||||||
|
|
||||||
// Add elem as a property of the handle function
|
// Add elem as a property of the handle function
|
||||||
// This is to prevent a memory leak with non-native
|
// This is to prevent a memory leak with non-native
|
||||||
// event in IE.
|
// event in IE.
|
||||||
|
|
Loading…
Add table
Reference in a new issue