From: jeresig <jeresig@gmail.com>
Date: Fri, 21 Jan 2011 16:20:05 +0000 (-0500)
Subject: Merge branch '8013p' of https://github.com/rwldrn/jquery into rwldrn-8013p
X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=61e80c55df9231c177d194ff075472898933c2c9;hp=-c

Merge branch '8013p' of https://github.com/rwldrn/jquery into rwldrn-8013p
---

61e80c55df9231c177d194ff075472898933c2c9
diff --combined src/core.js
index 236f84d,9af2882..aa97202
--- a/src/core.js
+++ b/src/core.js
@@@ -130,11 -130,11 +130,11 @@@ jQuery.fn = jQuery.prototype = 
  
  					} else {
  						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
- 						selector = (ret.cacheable ? jQuery(ret.fragment).clone()[0] : ret.fragment).childNodes;
+ 						selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes;
  					}
  
  					return jQuery.merge( this, selector );
 -
 +					
  				// HANDLE: $("#id")
  				} else {
  					elem = document.getElementById( match[2] );
@@@ -158,6 -158,13 +158,6 @@@
  					return this;
  				}
  
 -			// HANDLE: $("TAG")
 -			} else if ( !context && !rnonword.test( selector ) ) {
 -				this.selector = selector;
 -				this.context = document;
 -				selector = document.getElementsByTagName( selector );
 -				return jQuery.merge( this, selector );
 -
  			// HANDLE: $(expr, $(...))
  			} else if ( !context || context.jquery ) {
  				return (context || rootjQuery).find( selector );
@@@ -399,7 -406,7 +399,7 @@@ jQuery.extend(
  			}
  
  			// If there are functions bound, to execute
 -			readyList.fire( document , [ jQuery ] );
 +			readyList.resolveWith( document , [ jQuery ] );
  
  			// Trigger any bound ready events
  			if ( jQuery.fn.trigger ) {
@@@ -837,7 -844,7 +837,7 @@@
  						}
  
  						if ( _fired ) {
 -							deferred.fire( _fired[ 0 ] , _fired[ 1 ] );
 +							deferred.resolveWith( _fired[ 0 ] , _fired[ 1 ] );
  						}
  					}
  
@@@ -845,7 -852,7 +845,7 @@@
  				},
  
  				// resolve with given context and args
 -				fire: function( context , args ) {
 +				resolveWith: function( context , args ) {
  					if ( ! cancelled && ! fired && ! firing ) {
  
  						firing = 1;
@@@ -865,7 -872,7 +865,7 @@@
  
  				// resolve with this as context and given arguments
  				resolve: function() {
 -					deferred.fire( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments );
 +					deferred.resolveWith( jQuery.isFunction( this.promise ) ? this.promise() : this , arguments );
  					return this;
  				},
  
@@@ -901,7 -908,7 +901,7 @@@
  				return this;
  			},
  			fail: failDeferred.done,
 -			fireReject: failDeferred.fire,
 +			rejectWith: failDeferred.resolveWith,
  			reject: failDeferred.resolve,
  			isRejected: failDeferred.isResolved,
  			// Get a promise for this deferred
@@@ -954,10 -961,10 +954,10 @@@
  					args = arguments;
  					resolveArray[ index ] = args.length > 1 ? slice.call( args , 0 ) : value;
  					if( ! --length ) {
 -						deferred.fire( promise, resolveArray );
 +						deferred.resolveWith( promise, resolveArray );
  					}
  				}).fail( function() {
 -					deferred.fireReject( promise, arguments );
 +					deferred.rejectWith( promise, arguments );
  				});
  				return !deferred.isRejected();
  			});