Landing the initial jQuery.require() work. Need to add in remote scri…

…pt queueing.
jquery · Dec 10, 2009 · a5b2940 · a5b2940 · jeresig · Dec 11, 2009
1 parent 88572ee
commit a5b2940
Show file tree

Hide file tree

Showing 4 changed files with 246 additions and 56 deletions.
diff --git a/src/ajax.js b/src/ajax.js
@@ -5,7 +5,6 @@ var jsc = now(),
 	jsre = /=\?(&|$)/,
 	rquery = /\?/,
 	rts = /(\?|&)_=.*?(&|$)/,
-	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
 	r20 = /%20/g;
 
 jQuery.fn.extend({
@@ -273,43 +272,19 @@ jQuery.extend({
 		}
 
 		// Matches an absolute URL, and saves the domain
-		var parts = rurl.exec( s.url ),
-			remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
+		var remote = jQuery.isRemote( s.url );
 
 		// If we're requesting a remote document
 		// and trying to load JSON or Script with a GET
 		if ( s.dataType === "script" && type === "GET" && remote ) {
-			var head = document.getElementsByTagName("head")[0] || document.documentElement;
-			var script = document.createElement("script");
-			script.src = s.url;
-			if ( s.scriptCharset ) {
-				script.charset = s.scriptCharset;
-			}
-
-			// Handle Script loading
-			if ( !jsonp ) {
-				var done = false;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function(){
-					if ( !done && (!this.readyState ||
-							this.readyState === "loaded" || this.readyState === "complete") ) {
-						done = true;
-						success();
-						complete();
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
-						}
-					}
-				};
-			}
-
-			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709 and #4378).
-			head.insertBefore( script, head.firstChild );
+			jQuery.require({
+				url: s.url,
+				scriptCharset: s.scriptCharset,
+				success: function() {
+					success();
+					complete();
+				}
+			});
 
 			// We handle everything using the script element injection
 			return undefined;

diff --git a/src/core.js b/src/core.js
@@ -32,6 +32,9 @@ var jQuery = function( selector, context ) {
 	// Match a standalone tag
 	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
 
+	// Match portions of a URL
+	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
+
 	// Keep a UserAgent string for use with jQuery.browser
 	userAgent = navigator.userAgent.toLowerCase(),
 
@@ -40,7 +43,10 @@ var jQuery = function( selector, context ) {
 
 	// The functions to execute on DOM ready
 	readyList = [],
-
+
+	// The queue of required scripts currently being loaded
+	requireQueue = [],
+
 	// Save a reference to some core methods
 	toString = Object.prototype.toString,
 	hasOwnProperty = Object.prototype.hasOwnProperty,
@@ -339,22 +345,7 @@ jQuery.extend({
 			// Remember that the DOM is ready
 			jQuery.isReady = true;
 
-			// If there are functions bound, to execute
-			if ( readyList ) {
-				// Execute all of them
-				var fn, i = 0;
-				while ( (fn = readyList[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Reset the list of functions
-				readyList = null;
-			}
-
-			// Trigger any bound ready events
-			if ( jQuery.fn.triggerHandler ) {
-				jQuery( document ).triggerHandler( "ready" );
-			}
+			readyReady();
 		}
 	},
 
@@ -425,6 +416,93 @@ jQuery.extend({
 			}
 		}
 	},
+
+	require: function( options, callback ) {
+		var xhr, requestDone, ival, head, script;
+
+		if ( options && !options.url ) {
+			options = { url: options, success: callback };
+		}
+
+		if ( !options || jQuery.requireCache[ options.url ] != null ) {
+			return;
+		}
+
+		requireQueue.push( options );
+		jQuery.requireCache[ options.url ] = false;
+
+		// If the DOM ready event has already occurred, we need to go synchronous
+		if ( !jQuery.isRemote( options.url ) ) {
+			xhr = window.ActiveXObject ?
+				new ActiveXObject("Microsoft.XMLHTTP") :
+				new XMLHttpRequest(),
+
+			xhr.open( "GET", options.url, !jQuery.isReady );
+			xhr.send( null );
+
+			function checkDone() {
+                        	if ( !requestDone && xhr && xhr.readyState === 4 ) {
+                                	requestDone = true;
+
+                                	// clear poll interval
+                                	if ( ival ) {
+                                        	clearInterval( ival );
+                                        	ival = null;
+                                	}
+
+					execRequire( options.url, xhr.responseText );
+				}
+			}
+
+			if ( jQuery.isReady ) {
+				checkDone();
+			} else {
+				ival = setInterval( checkDone, 13 );
+			}
+
+		// Otherwise we can still load scripts asynchronously
+		} else {
+			head = document.getElementsByTagName("head")[0] || document.documentElement;
+			script = document.createElement("script");
+
+			script.src = options.url;
+
+			if ( options.scriptCharset ) {
+				script.charset = options.scriptCharset;
+			}
+
+			// Attach handlers for all browsers
+			script.onload = script.onreadystatechange = function() {
+				if ( !requestDone && (!this.readyState ||
+						this.readyState === "loaded" || this.readyState === "complete") ) {
+
+					requestDone = true;
+
+					// Handle memory leak in IE
+					script.onload = script.onreadystatechange = null;
+
+					if ( head && script.parentNode ) {
+						head.removeChild( script );
+					}
+
+					execRequire( options.url );
+				}
+			};
+
+			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709 and #4378).
+			head.insertBefore( script, head.firstChild );
+		}
+	},
+
+	// Keep track of URLs that have been loaded
+	requireCache: {},
+
+	// Check to see if a URL is a remote URL
+	isRemote: function( url ) {
+		var parts = rurl.exec( url );
+		return parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
+	},
 
 	// See test/unit/core.js for details concerning isFunction.
 	// Since version 1.3, DOM methods and functions like alert
@@ -638,13 +716,74 @@ if ( indexOf ) {
 // All jQuery objects should point back to these
 rootjQuery = jQuery(document);
 
+function readyReady() {
+	if ( jQuery.isReady && requireQueue.length === 0 ) {
+		// If there are functions bound, to execute
+		if ( readyList ) {
+			// Execute all of them
+			var fn, i = 0;
+			while ( (fn = readyList[ i++ ]) ) {
+				fn.call( document, jQuery );
+			}
+
+			// Reset the list of functions
+			readyList = null;
+
+			// Trigger any bound ready events
+			if ( jQuery.fn.triggerHandler ) {
+				jQuery( document ).triggerHandler( "ready" );
+			}
+		}
+	}
+}
+
+function execRequire( url, script ) {
+	var item, i, exec = true;
+
+	jQuery.requireCache[ url ] = true;
+
+	for ( i = 0; i < requireQueue.length; i++ ) {
+		item = requireQueue[i];
+
+		if ( item.url === url ) {
+			if ( script != null ) {
+				item.script = script;
+			} else {
+				next();
+				continue;
+			}
+
+		}
+
+		if ( exec && item.script ) {
+			jQuery.globalEval( item.script );
+			next();
+		} else {
+			exec = false;
+		}
+	}
+
+	// Check to see if all scripts have been loaded
+	for ( var script in jQuery.requireCache ) {
+		if ( jQuery.requireCache[ script ] === false ) {
+			return;
+		}
+	}
+
+	readyReady();
+
+	function next() {
+			if ( jQuery.isFunction( item.callback ) ) {
+				item.callback();
+			}
+
+			requireQueue.splice( i--, 1 );
+	}
+}
+
 function evalScript( i, elem ) {
 	if ( elem.src ) {
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
+		jQuery.require( elem.src );
 	} else {
 		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
 	}

diff --git a/test/data/require.php b/test/data/require.php
@@ -0,0 +1,9 @@
+<?php
+error_reporting(0);
+$wait = $_REQUEST['wait'];
+if($wait) {
+        sleep($wait);
+}
+
+echo "requireTest(" . $_REQUEST['response'] . ");";
+?>
diff --git a/test/unit/core.js b/test/unit/core.js
@@ -759,3 +759,70 @@ test("jQuery.isEmptyObject", function(){
 	// What about this ?
 	// equals(true, jQuery.isEmptyObject(null), "isEmptyObject on null" );
 });
+
+asyncTest(".require() - Document Not Ready, Local", 3, function() {
+	jQuery.isReady = false;
+	jQuery.requireCache = {};
+
+	var order = [];
+
+	window.requireTest = function( num ) {
+		order.push( num );
+		equals( order.length, num, "Make sure that the results are coming in in the right order." );
+
+		if ( num === 3 ) {
+			jQuery.isReady = true;
+			start();
+		}
+	};
+
+	jQuery.require("data/require.php?wait=1&response=1");
+	jQuery.require("data/require.php?response=2");
+	jQuery.require("data/require.php?response=3");
+});
+
+asyncTest(".require() - Document Ready, Local", 3, function() {
+	jQuery.isReady = true;
+	jQuery.requireCache = {};
+
+	var order = [];
+
+	window.requireTest = function( num ) {
+		order.push( num );
+		equals( order.length, num, "Make sure that the results are coming in in the right order." );
+
+		if ( num === 3 ) {
+			start();
+		}
+	};
+
+	jQuery.require("data/require.php?wait=1&response=1");
+	jQuery.require("data/require.php?response=2");
+	jQuery.require("data/require.php?response=3");
+});
+
+asyncTest(".require() - Document Ready, Remote", 3, function() {
+	jQuery.isReady = true;
+	jQuery.requireCache = {};
+
+	var order = [], old = jQuery.isRemote;
+
+	window.requireTest = function( num ) {
+		order.push( num );
+		equals( order.length, num, "Make sure that the results are coming in in the right order." );
+
+		jQuery.isRemote = old;
+
+		if ( num === 3 ) {
+			start();
+		}
+	};
+
+	jQuery.isRemote = function(){
+		return true;
+	};
+
+	jQuery.require("data/require.php?wait=1&response=1");
+	jQuery.require("data/require.php?response=2");
+	jQuery.require("data/require.php?response=3");
+});