Skip to content
Permalink
Browse files

Consistently clean up after .ready() handler, close gh-1135.

  • Loading branch information...
markelog authored and dmethvin committed Jan 15, 2013
1 parent 1ad874f commit dbf4926e31390ceda57730c68d40f34536803114
Showing with 6 additions and 5 deletions.
  1. +6 −5 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 );

0 comments on commit dbf4926

Please sign in to comment.
You can’t perform that action at this time.