Allow plugins to delay the exeuction of the ready event. Delay the ready event by...

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 905a399..2b00627 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -1,4 +1,4 @@
-(function() {
+var jQuery = (function() {
 
 // Define a local copy of jQuery
 var jQuery = function( selector, context ) {
@@ -109,7 +109,7 @@ jQuery.fn = jQuery.prototype = {
                                                }
 
                                        } else {
-                                               ret = buildFragment( [ match[1] ], [ doc ] );
+                                               ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
                                                selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
                                        }
                                        
@@ -360,11 +360,20 @@ jQuery.extend({
        
        // Is the DOM ready to be used? Set to true once it occurs.
        isReady: false,
+
+       // A counter to track how many items to wait for before
+       // the ready event fires. See #6781
+       readyWait: 1,
        
        // Handle when the DOM is ready
-       ready: function() {
+       ready: function( wait ) {
+               // A third-party is pushing the ready event forwards
+               if ( wait === true ) {
+                       jQuery.readyWait--;
+               }
+
                // Make sure that the DOM is not already loaded
-               if ( !jQuery.isReady ) {
+               if ( !jQuery.readyWait && !jQuery.isReady ) {
                        // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
                        if ( !document.body ) {
                                return setTimeout( jQuery.ready, 13 );
@@ -373,6 +382,11 @@ jQuery.extend({
                        // Remember that the DOM is ready
                        jQuery.isReady = true;
 
+                       // If a normal DOM Ready event fired, decrement, and wait if need be
+                       if ( wait !== true && --jQuery.readyWait > 0 ) {
+                               return;
+                       }
+
                        // If there are functions bound, to execute
                        if ( readyList ) {
                                // Execute all of them
@@ -605,7 +619,7 @@ jQuery.extend({
                        // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
                        var type = jQuery.type(array);
 
-                       if ( array.length == null || type === "string" || type === "function" || type === "regexp" || (typeof type !== "function" && array.setInterval) ) {
+                       if ( array.length == null || type === "string" || type === "function" || type === "regexp" || "setInterval" in array ) {
                                push.call( ret, array );
                        } else {
                                jQuery.merge( ret, array );
@@ -826,6 +840,6 @@ function doScrollCheck() {
 }
 
 // Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
+return (window.jQuery = window.$ = jQuery);
 
 })();