aboutsummaryrefslogtreecommitdiffstats
path: root/src/core.js
diff options
context:
space:
mode:
authorOleg <markelog@gmail.com>2013-01-15 18:45:21 +0400
committerDave Methvin <dave.methvin@gmail.com>2013-01-20 18:20:53 -0500
commitdbf4926e31390ceda57730c68d40f34536803114 (patch)
tree8060193f1340c9bd65e397596758ee42d9d4786d /src/core.js
parent1ad874f3447cdba89d77cfe00b10d6f1d7dcea4e (diff)
downloadjquery-dbf4926e31390ceda57730c68d40f34536803114.tar.gz
jquery-dbf4926e31390ceda57730c68d40f34536803114.zip
Consistently clean up after .ready() handler, close gh-1135.
Diffstat (limited to 'src/core.js')
-rw-r--r--src/core.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core.js b/src/core.js
index 202188deb..d909c8144 100644
--- a/src/core.js
+++ b/src/core.js
@@ -62,8 +62,9 @@ var
},
// The ready event handler and self cleanup method
- DOMContentLoaded = function() {
- document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+ completed = function() {
+ document.removeEventListener( "DOMContentLoaded", completed, false );
+ window.removeEventListener( "load", completed, false );
jQuery.ready();
};
@@ -770,13 +771,13 @@ jQuery.ready.promise = function( obj ) {
// Handle it asynchronously to allow scripts the opportunity to delay ready
setTimeout( jQuery.ready );
- // Standards-based browsers support DOMContentLoaded
} else {
+
// Use the handy event callback
- document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+ document.addEventListener( "DOMContentLoaded", completed, false );
// A fallback to window.onload, that will always work
- window.addEventListener( "load", jQuery.ready, false );
+ window.addEventListener( "load", completed, false );
}
}
return readyList.promise( obj );