X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore.js;h=b738ce485584f2d31d65b13eef387e4a4f238662;hb=59802928566b6be3a66d65e77c2418fff37e6f5f;hp=4949d6bf4e2a9de52eb0ca2683125e9be9433861;hpb=2b481b93cfca62f95aa7005e7db651456fa08e65;p=jquery.git diff --git a/src/core.js b/src/core.js index 4949d6b..b738ce4 100644 --- a/src/core.js +++ b/src/core.js @@ -29,7 +29,7 @@ var jQuery = function( selector, context ) { rnotwhite = /\S/, // Used for trimming whitespace - rtrim = /(\s|\u00A0)+|(\s|\u00A0)+$/g, + rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g, // Match a standalone tag rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, @@ -273,9 +273,9 @@ jQuery.extend = jQuery.fn.extend = function() { } // Recurse if we're merging object literal values - if ( deep && copy && jQuery.isObjectLiteral(copy) ) { + if ( deep && copy && jQuery.isPlainObject(copy) ) { // Don't extend not object literals - var clone = src && jQuery.isObjectLiteral(src) ? src : {}; + var clone = src && jQuery.isPlainObject(src) ? src : {}; // Never move original objects, clone them target[ name ] = jQuery.extend( deep, clone, copy ); @@ -314,7 +314,7 @@ jQuery.extend({ return toString.call(obj) === "[object Array]"; }, - isObjectLiteral: function( obj ) { + isPlainObject: function( obj ) { if ( toString.call(obj) !== "[object Object]" || typeof obj.nodeType === "number" ) { return false; } @@ -342,14 +342,6 @@ jQuery.extend({ return true; }, - // check if an element is in a (or is an) XML document - isXMLDoc: function( elem ) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; - return documentElement ? documentElement.nodeName !== "HTML" : false; - }, - // Evalulates a script in a global context globalEval: function( data ) { if ( data && rnotwhite.test(data) ) {