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;
// Handle $(DOMElement)
if ( selector.nodeType ) {
this.context = this[0] = selector;
- this.length++;
+ this.length = 1;
return this;
}
}
// Otherwise, we inject the element directly into the jQuery object
- this.length++;
+ this.length = 1;
this[0] = elem;
}
this.context = selector.context;
}
- return this.setArray(jQuery.isArray( selector ) ?
- selector :
- jQuery.makeArray(selector));
+ return jQuery.isArray( selector ) ?
+ this.setArray( selector ) :
+ jQuery.makeArray( selector, this );
},
// Start with an empty selector
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 );
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 ) {
return (text || "").replace( rtrim, "" );
},
- makeArray: function( array ) {
- var ret = [], i;
+ // results is for internal usage only
+ makeArray: function( array, results ) {
+ var ret = results || [];
if ( array != null ) {
- i = array.length;
-
// The window, strings (and functions) also have 'length'
- if ( i == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval ) {
- ret[0] = array;
+ if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval ) {
+ push.call( ret, array );
} else {
- while ( i ) {
- ret[--i] = array[i];
- }
+ jQuery.merge( ret, array );
}
}
},
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;
},
merge: function( first, second ) {
- // We have to loop this way because IE & Opera overwrite the length
- // expando of getElementsByTagName
- var i = 0, elem, pos = first.length;
+ var pos, i = second.length;
- while ( (elem = second[ i++ ]) != null ) {
- first[ pos++ ] = elem;
+ // We have to get length this way when IE & Opera overwrite the length
+ // expando of getElementsByTagName
+ if ( i && i.nodeType ) {
+ for ( i = 0; second[i]; ++i ) {}
+ }
+
+ pos = i + first.length;
+
+ // Correct length for non Arrays
+ first.length = pos;
+
+ while ( i ) {
+ first[ --pos ] = second[ --i ];
}
return first;