Removed uses of arguments.callee from jQuery.

mojombo · Dec 8, 2009 · 98ce35d · 98ce35d
1 parent 00a0abb
commit 98ce35d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/core.js b/src/core.js
@@ -373,8 +373,8 @@ jQuery.extend({
 		// Mozilla, Opera and webkit nightlies currently support this event
 		if ( document.addEventListener ) {
 			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", function() {
-				document.removeEventListener( "DOMContentLoaded", arguments.callee, false );
+			document.addEventListener( "DOMContentLoaded", function DOMContentLoaded() {
+				document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
 				jQuery.ready();
 			}, false );
 
@@ -385,10 +385,10 @@ jQuery.extend({
 		} else if ( document.attachEvent ) {
 			// ensure firing before onload,
 			// maybe late but safe also for iframes
-			document.attachEvent("onreadystatechange", function() {
+			document.attachEvent("onreadystatechange", function onreadystatechange() {
 				// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
 				if ( document.readyState === "complete" ) {
-					document.detachEvent( "onreadystatechange", arguments.callee );
+					document.detachEvent( "onreadystatechange", onreadystatechange );
 					jQuery.ready();
 				}
 			});
@@ -405,7 +405,9 @@ jQuery.extend({
 			} catch(e){}
 
 			if ( document.documentElement.doScroll && toplevel ) {
-				(function() {
+				doScrollCheck();
+
+				function doScrollCheck() {
 					if ( jQuery.isReady ) {
 						return;
 					}
@@ -415,13 +417,13 @@ jQuery.extend({
 						// http://javascript.nwbox.com/IEContentLoaded/
 						document.documentElement.doScroll("left");
 					} catch( error ) {
-						setTimeout( arguments.callee, 0 );
+						setTimeout( doScrollCheck, 1 );
 						return;
 					}
 
 					// and execute any waiting functions
 					jQuery.ready();
-				})();
+				}
 			}
 		}
 	},

diff --git a/src/event.js b/src/event.js
@@ -37,11 +37,11 @@ jQuery.event = {
 
 		// Init the element's event structure
 		var events = jQuery.data( elem, "events" ) || jQuery.data( elem, "events", {} ),
-			handle = jQuery.data( elem, "handle" ) || jQuery.data( elem, "handle", function() {
+			handle = jQuery.data( elem, "handle" ) || jQuery.data( elem, "handle", function eventHandle() {
 				// Handle the second event of a trigger and when
 				// an event is called after a page has unloaded
 				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
-					jQuery.event.handle.apply( arguments.callee.elem, arguments ) :
+					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
 					undefined;
 			});
 		// Add elem as a property of the handle function