Made jQuery.extend(true, ...) to extend recursively only 'object literal' values.

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index ff31e81..b821336 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -32,13 +32,14 @@ var jQuery = function( selector, context ) {
        rtrim = /^\s+|\s+$/g,
 
        // Match a standalone tag
-       rsingleTag = /^<(\w+)\s*\/?>$/,
+       rsingleTag = /<(\w+)\s*\/?>(?:<\/\1>)?$/,
 
        // Keep a UserAgent string for use with jQuery.browser
        userAgent = navigator.userAgent.toLowerCase(),
 
        // Save a reference to some core methods
        toString = Object.prototype.toString,
+       hasOwnProperty = Object.prototype.hasOwnProperty,
        push = Array.prototype.push,
        slice = Array.prototype.slice,
        indexOf = Array.prototype.indexOf;
@@ -55,7 +56,7 @@ jQuery.fn = jQuery.prototype = {
                // Handle $(DOMElement)
                if ( selector.nodeType ) {
                        this.context = this[0] = selector;
-                       this.length++;
+                       this.length = 1;
                        return this;
                }
 
@@ -95,7 +96,7 @@ jQuery.fn = jQuery.prototype = {
                                                }
 
                                                // Otherwise, we inject the element directly into the jQuery object
-                                               this.length++;
+                                               this.length = 1;
                                                this[0] = elem;
                                        }
 
@@ -271,19 +272,10 @@ jQuery.extend = jQuery.fn.extend = function() {
                                        continue;
                                }
 
-                               // Recurse if we're merging object values
-                               if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
-                                       var clone;
-
-                                       if ( src ) {
-                                               clone = src;
-                                       } else if ( jQuery.isArray(copy) ) {
-                                               clone = [];
-                                       } else if ( jQuery.isObject(copy) ) {
-                                               clone = {};
-                                       } else {
-                                               clone = copy;
-                                       }
+                               // Recurse if we're merging object literal values
+                               if ( deep && copy && jQuery.isObjectLiteral(copy) ) {
+                                       // Don't extend not object literals
+                                       var clone = src && jQuery.isObjectLiteral(src) ? src : {};
 
                                        // Never move original objects, clone them
                                        target[ name ] = jQuery.extend( deep, clone, copy );
@@ -322,8 +314,25 @@ jQuery.extend({
                return toString.call(obj) === "[object Array]";
        },
 
-       isObject: function( obj ) {
-               return this.constructor.call(obj) === Object;
+       isObjectLiteral: function( obj ) {
+               if ( toString.call(obj) !== "[object Object]" ) {
+                       return false;
+               }
+               
+               // not own constructor property must be Object
+               if ( obj.constructor
+                 && !hasOwnProperty.call(obj, "constructor")
+                 && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
+                       return false;
+               }
+               
+               //own properties are iterated firstly,
+               //so to speed up, we can test last one if it is own or not
+       
+               var key;
+               for ( key in obj ) {}
+               
+               return key === undefined || hasOwnProperty.call( obj, key );
        },
 
        isEmptyObject: function( obj ) {
@@ -430,6 +439,10 @@ jQuery.extend({
        },
 
        inArray: function( elem, array ) {
+               if ( array.indexOf ) {
+                       return array.indexOf( elem );
+               }
+
                for ( var i = 0, length = array.length; i < length; i++ ) {
                        if ( array[ i ] === elem ) {
                                return i;