Renamed several ajaxSettings options. Removed cors test, fixed failing cors test.

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 57a42d0..eb0c1c8 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -936,20 +936,15 @@ jQuery.extend({
        },
 
        // Check if an object is a deferred
-       isDeferred: function( object , method ) {
-               method = method || "then";
-               return !!( object && object[ method ] && object[ method ]._ === deferredMarker );
+       isDeferred: function( object ) {
+               return !!( object && object.then && object.then._ === deferredMarker );
        },
        
        // Deferred helper
-       when: function( object , method ) {
-               method = method || "then";
-               object = jQuery.isDeferred( object , method ) ?
+       when: function( object ) {
+               object = jQuery.isDeferred( object ) ?
                        object :
                        jQuery.Deferred().resolve( object );
-               object.fail = object.fail || function() { return this; };
-               object[ method ] = object[ method ] || object.then;
-               object.then = object.then || object[ method ];
                return object;
        },
 
@@ -1043,6 +1038,11 @@ function doScrollCheck() {
        jQuery.ready();
 }
 
+// Expose jQuery as an Asynchronous Module
+if ( typeof define !== "undefined" ) {
+       define( "jquery", [], function () { return jQuery; } );
+}
+
 // Expose jQuery to the global object
 return (window.jQuery = window.$ = jQuery);