Refactor jQuery.data a bit to reduce property lookups

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 35e6e34..74b9fee 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -130,10 +130,10 @@ jQuery.fn = jQuery.prototype = {
                return num == null ?
 
                        // Return a 'clean' array
-                       Array.prototype.slice.call( this ) :
+                       this.toArray() :
 
                        // Return just the object
-                       this[ num ];
+                       ( num < 0 ? this.toArray.call(this, num)[0] : this[ num ] );
        },
 
        // Take an array of elements and push it onto the stack
@@ -243,9 +243,15 @@ jQuery.extend = jQuery.fn.extend = function() {
 
                                // Recurse if we're merging object values
                                if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
-                                       target[ name ] = jQuery.extend( deep,
-                                               // Never move original objects, clone them
-                                               src || ( copy.length != null ? [ ] : { } ), copy );
+                                       var clone;
+
+                                       if( src ) clone = src;
+                                       else if( jQuery.isArray(copy) ) clone = [ ];
+                                       else if( jQuery.isObject(copy) ) clone = { };
+                                       else clone = copy;
+
+                                       // Never move original objects, clone them
+                                       target[ name ] = jQuery.extend( deep, clone, copy );
 
                                // Don't bring in undefined values
                                } else if ( copy !== undefined ) {
@@ -281,6 +287,16 @@ jQuery.extend({
                return toString.call(obj) === "[object Array]";
        },
 
+       isObject: function( obj ) {
+               return this.constructor.call(obj) === Object;
+       },
+
+       isEmptyObject: function( obj ) {
+               var name = "";
+               for(name in obj) break;
+               return !name;
+       },
+
        // check if an element is in a (or is an) XML document
        isXMLDoc: function( elem ) {
                return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||