Updated jquery.defer.js and samples to work with recent breaking chan…

…ges in jQuery APIs for Deferred()

README.md

@@ -1,3 +1,17 @@
+# JsDefer recent Status:
+
+There have been some breaking changes in jQuery APIs for Deferred since JsDefer was implemented.
+
+A recent JsDefer commit modifies jquery.defer.js to make it agains compatible with current 
+jQuery APIs.
+
+However the non-jquery version of JsDefer - jsdefer.js - uses the previous Deferred APIs, 
+which means that you cannot currently load jsdefer.js and then have it load jQuery! 
+You need to determine up front whether you want the version with or without jQuery...
+
+Apart from the above fixes, JsDefer is not being actively updated at the moment, but will 
+probably become active again at some point after JsViews V1.0 has shipped.
+
 # JsDefer Features:
 
 * Wrapped scripts
@@ -29,16 +43,16 @@ are provided to illustrate different use scenarios for JsDefer.
 ### Feature tests:
 
 * Basic Features: Currently no unit tests are provided (they will come) but the
-[FeatureTests/Basic](https://github.com/BorisMoore/jsdefer/tree/master/demos/featuretests/basic)
+[FeatureTests/Basic](https://github.com/BorisMoore/jsdefer/tree/master/demos/feature-tests/basic)
 folder provides some examples for testing different feature details.
 * Advanced Features:
-[This folder](https://github.com/BorisMoore/jsdefer/tree/master/demos/featuretests/withorwithoutjquery)
+[This folder](https://github.com/BorisMoore/jsdefer/tree/master/demos/featuretests/with-or-without-jquery)
 shows how to use JsDefer with or without jQuery.
-[These samples](https://github.com/BorisMoore/jsdefer/tree/master/demos/featuretests/advanced)
+[These samples](https://github.com/BorisMoore/jsdefer/tree/master/demos/feature-tests/advanced)
 illustrate some less-commonly used features.
-The [AsyncTemplates](https://github.com/BorisMoore/jsdefer/tree/master/demos/featuretests/advanced/asynctemplates)
+The [AsyncTemplates](https://github.com/BorisMoore/jsdefer/tree/master/demos/feature-tests/advanced/async-templates)
 folder explores some experimental integration with
-[jQuery Templates](https://github.com/jquery/jquery-tmpl).
+[jQuery Templates](https://github.com/BorisMoore/jquery-tmpl).
 
 
 ## Syntax Examples:

demos/feature-tests/basic/2a_def.html

@@ -12,7 +12,7 @@
 			a: {
 				url: "../resources/folder1/a.js",
 				minUrl: "../resources/folder1/a.min.js",
-				depends: [ "e", "../resources/f.js" ]
+				depends: [ "e", "../../resources/f.js" ]
 			},
 			e: "../resources/folder2/e.js"
 		});

demos/feature-tests/basic/3_join-with-when.html

@@ -7,12 +7,12 @@
 	<script src="../../../jquery.defer.js" type="text/javascript"></script>
 
 	<script type="text/javascript">
-
+		var $ready = $.ready.promise();
 		var f = $.defer( "../resources/f.js", {
 				delayDomReady: true
 			})
 			.done( function(){
-				log( "f loaded. DomReady: " + $.ready.isResolved() );
+				log( "f loaded. DomReady: " + ($ready.state() === "resolved"));
 			});
 
 		var a = $.defer( "../resources/folder1/a.js" );
@@ -22,7 +22,7 @@
 				f
 			)
 			.done( function(){
-				log( "a and f loaded. DomReady: " + $.ready.isResolved() );
+				log( "a and f loaded. DomReady: " + ($ready.state() === "resolved"));
 			});
 
 		$.when(

demos/feature-tests/resources/f.js

@@ -1,8 +1,8 @@
 ((window.$deferRun || function( run ){ run(); }) (
 
-function( $, options ) {
-	window.testloaded.f = "";
-	return options && options.myVal + ". File:  f";
-}
+	function( $, options ) {
+		window.testloaded.f = "";
+		return options && options.myVal + ". File:  f";
+	}
 
 ));

demos/feature-tests/resources/folder1/a.js

@@ -1,13 +1,10 @@
 ((window.$deferRun || function( run ){ run(); }) (
 
-function( $, options ) {
-
-	window.testloaded.a = "";
-	if ( $ ) {
-		return options && options.myVal + ". File:  a";
+	function( $, options ) {
+		window.testloaded.a = "";
+		if ( $ ) {
+			return options && options.myVal + ". File:  a";
+		}
 	}
 
-}
-
-//);
 ));

demos/feature-tests/resources/folder2/c.js

@@ -1,8 +1,8 @@
 ((window.$deferRun || function( run ){ run(); }) (
 
-function( $, options ) {
-	window.testloaded.c = "";
-	return options && options.myVal + ". File:  c";
-}
+	function( $, options ) {
+		window.testloaded.c = "";
+		return options && options.myVal + ". File:  c";
+	}
 
-));
+));

demos/feature-tests/resources/folder2/d.js

@@ -1,8 +1,8 @@
 ((window.$deferRun || function( run ){ run(); }) (
 
-function( $, options ) {
-	window.testloaded.d = "";
-	return options && options.myVal + ". File:  d";
-}
+	function( $, options ) {
+		window.testloaded.d = "";
+		return options && options.myVal + ". File:  d";
+	}
 
 ));

jquery.defer.js

@@ -81,7 +81,7 @@ $.extend({
 			var i, thisRunCb = runCb || scriptDef.runCb; // For multiple or composite scripts, callback was passed via scriptDef
 
 			if ( !(runWait--) ) {
-				if ( !asyncLoad.isRejected() ) {
+				if ( asyncLoad.state() !== "rejected" ) {
 					if ( parentPromise ) {
 						asyncLoad.resolve(
 							result ||
@@ -312,15 +312,6 @@ deferSettings = $.deferSettings;
 defer = $.defer;
 ready = $.ready;
 
-readyDefer = $.Deferred();
-readyDefer.promise( ready );
-
-// Workaround, to expose domReady promise
-// (only needed because the Dom Ready promise is not exposed by core).
-$( function() {
-	readyDefer.resolve();
-});
-
 })( jQuery, window );
 
 

jsdefer.js

@@ -9,7 +9,7 @@ var $, document = window.document,
 	scriptByUrl = {},
 	loadingScripts = [],
 	loadingSubScripts,
-	promiseMethods = "then done fail isResolved isRejected promise".split( " " ),
+	promiseMethods = "then done fail state promise".split( " " ),
 	slice = [].slice;
 
 if ( window.jQuery ) {
@@ -26,7 +26,7 @@ if ( window.jQuery ) {
 	////////////////////////////////////////////////////////////////////////////////////////////////
 	// jQuery is not loaded. Make $ the jsDefer object
 
-	// Use a 'clone' of the implementation of Deferred from jQuery-1.5.js
+	// Use a 'clone' of the implementation of Deferred from jQuery-1.10.0.js
 	// to provide identical Deferred APIs and behavior to jQuery.
 
 	// Also provide simplified support for $.extend, DomReady and AJAX x-domain requests,