X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=e7efb655612b90f4f38bdedddbff5f2ec9f10f7e;hb=a43a5ca9cf79afcd662df5b9110d7ccba45c0b53;hp=915ac6ba4502628c2005f47a0174fb3a281bfe57;hpb=4e975430510f443ef76a90d077bc8956fb8b8cc0;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 915ac6b..e7efb65 100644
--- a/src/core.js
+++ b/src/core.js
@@ -56,16 +56,8 @@ var jQuery = function( selector, context ) {
 	// The deferred used on DOM ready
 	readyList,
 
-	// Promise methods (with equivalent for invert)
-	promiseMethods = {
-		then: 0, // will be overwritten for invert
-		done: "fail",
-		fail: "done",
-		isResolved: "isRejected",
-		isRejected: "isResolved",
-		promise: "invert",
-		invert: "promise"
-	},
+	// Promise methods
+	promiseMethods = "then done fail isResolved isRejected promise".split( " " ),
 
 	// The ready event handler
 	DOMContentLoaded,
@@ -302,7 +294,7 @@ jQuery.fn = jQuery.prototype = {
 jQuery.fn.init.prototype = jQuery.fn;
 
 jQuery.extend = jQuery.fn.extend = function() {
-	 var options, name, src, copy, copyIsArray, clone,
+	var options, name, src, copy, copyIsArray, clone,
 		target = arguments[0] || {},
 		i = 1,
 		length = arguments.length,
@@ -574,10 +566,8 @@ jQuery.extend({
 		if ( data && rnotwhite.test(data) ) {
 			// Inspired by code by Andrea Giammarchi
 			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
+			var head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement,
+				script = document.createElement( "script" );
 
 			if ( jQuery.support.scriptEval() ) {
 				script.appendChild( document.createTextNode( data ) );
@@ -887,9 +877,8 @@ jQuery.extend({
 	Deferred: function( func ) {
 		var deferred = jQuery._Deferred(),
 			failDeferred = jQuery._Deferred(),
-			promise,
-			invert;
-		// Add errorDeferred methods, then, promise and invert
+			promise;
+		// Add errorDeferred methods, then and promise
 		jQuery.extend( deferred, {
 			then: function( doneCallbacks, failCallbacks ) {
 				deferred.done( doneCallbacks ).fail( failCallbacks );
@@ -901,35 +890,18 @@ jQuery.extend({
 			isRejected: failDeferred.isResolved,
 			// Get a promise for this deferred
 			// If obj is provided, the promise aspect is added to the object
-			promise: function( obj ) {
+			promise: function( obj , i /* internal */ ) {
 				if ( obj == null ) {
 					if ( promise ) {
 						return promise;
 					}
 					promise = obj = {};
 				}
-				for( var methodName in promiseMethods ) {
-					obj[ methodName ] = deferred[ methodName ];
+				i = promiseMethods.length;
+				while( i-- ) {
+					obj[ promiseMethods[ i ] ] = deferred[ promiseMethods[ i ] ];
 				}
 				return obj;
-			},
-			// Get the invert promise for this deferred
-			// If obj is provided, the invert promise aspect is added to the object
-			invert: function( obj ) {
-				if ( obj == null ) {
-					if ( invert ) {
-						return invert;
-					}
-					invert = obj = {};
-				}
-				for( var methodName in promiseMethods ) {
-					obj[ methodName ] = promiseMethods[ methodName ] && deferred[ promiseMethods[methodName] ];
-				}
-				obj.then = invert.then || function( doneCallbacks, failCallbacks ) {
-					deferred.done( failCallbacks ).fail( doneCallbacks );
-					return this;
-				};
-				return obj;
 			}
 		} );
 		// Make sure only one callback list will be used
@@ -1078,6 +1050,6 @@ function doScrollCheck() {
 }
 
 // Expose jQuery to the global object
-return (window.jQuery = window.$ = jQuery);
+return jQuery;
 
 })();