Expose the JSON parsing logic. Fixes #5914.

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 2c5445a..5c99068 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -33,7 +33,10 @@ var jQuery = function( selector, context ) {
        rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
 
        // Keep a UserAgent string for use with jQuery.browser
-       userAgent = navigator.userAgent.toLowerCase(),
+       userAgent = navigator.userAgent,
+
+       // For matching the engine and version of the browser
+       browserMatch,
        
        // Has the ready events already been bound?
        readyBound = false,
@@ -313,10 +316,10 @@ jQuery.extend = jQuery.fn.extend = function() {
                                        continue;
                                }
 
-                               // Recurse if we're merging object literal values
-                               if ( deep && copy && jQuery.isPlainObject(copy) ) {
-                                       // Don't extend not object literals
-                                       var clone = src && jQuery.isPlainObject(src) ? src : {};
+                               // Recurse if we're merging object literal values or arrays
+                               if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
+                                       var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
+                                               : jQuery.isArray(copy) ? [] : {};
 
                                        // Never move original objects, clone them
                                        target[ name ] = jQuery.extend( deep, clone, copy );
@@ -463,6 +466,34 @@ jQuery.extend({
                }
                return true;
        },
+       
+       error: function( msg ) {
+               throw msg;
+       },
+       
+       parseJSON: function( data ) {
+               // Make sure the incoming data is actual JSON
+               // Logic borrowed from http://json.org/json2.js
+               if (/^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
+                       .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
+                       .replace(/(?:^|:|,)(?:\s*\[)+/g, ""))) {
+
+                       // Try to use the native JSON parser first
+                       if ( window.JSON && window.JSON.parse ) {
+                               data = window.JSON.parse( data );
+
+                       } else {
+                               data = (new Function("return " + data))();
+                       }
+
+               } else {
+                       jQuery.error( "Invalid JSON: " + data );
+               }
+               
+               return data;    
+       },
+
+       noop: function() {},
 
        // Evalulates a script in a global context
        globalEval: function( data ) {
@@ -618,17 +649,28 @@ jQuery.extend({
        guid: 1,
 
        proxy: function( fn, proxy, thisObject ) {
-               if ( arguments.length === 2 && proxy && !jQuery.isFunction( proxy ) ) {
-                       thisObject = proxy;
-                       proxy = undefined;
+               if ( arguments.length === 2 ) {
+                       if ( typeof proxy === "string" ) {
+                               thisObject = fn;
+                               fn = thisObject[ proxy ];
+                               proxy = undefined;
+
+                       } else if ( proxy && !jQuery.isFunction( proxy ) ) {
+                               thisObject = proxy;
+                               proxy = undefined;
+                       }
                }
 
-               proxy = proxy || function() {
-                       return fn.apply( thisObject || this, arguments );
-               };
+               if ( !proxy && fn ) {
+                       proxy = function() {
+                               return fn.apply( thisObject || this, arguments );
+                       };
+               }
 
                // Set the guid of unique handler to the same of original handler, so it can be removed
-               proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+               if ( fn ) {
+                       proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+               }
 
                // So proxy can be declared as an argument
                return proxy;
@@ -636,17 +678,31 @@ jQuery.extend({
 
        // Use of jQuery.browser is frowned upon.
        // More details: http://docs.jquery.com/Utilities/jQuery.browser
-       browser: {
-               version: (/.*?(?:firefox|safari|opera|msie)[\/ ]([\d.]+)/.exec(userAgent) || [0,"0"])[1],
-               safari: /safari/.test( userAgent ),
-               opera: /opera/.test( userAgent ),
-               msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
-               firefox: /firefox/.test( userAgent )
-       }
+       uaMatch: function( ua ) {
+               ua = ua.toLowerCase();
+
+               var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+                       /(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) ||
+                       /(msie) ([\w.]+)/.exec( ua ) ||
+                       !/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) ||
+                       [];
+
+               return { browser: match[1] || "", version: match[2] || "0" };
+       },
+
+       browser: {}
 });
 
-// Deprecated
-jQuery.browser.mozilla = /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent );
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+       jQuery.browser[ browserMatch.browser ] = true;
+       jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+       jQuery.browser.safari = true;
+}
 
 if ( indexOf ) {
        jQuery.inArray = function( elem, array ) {
@@ -693,12 +749,6 @@ function doScrollCheck() {
        jQuery.ready();
 }
 
-if ( indexOf ) {
-       jQuery.inArray = function( elem, array ) {
-               return indexOf.call( array, elem );
-       };
-}
-
 function evalScript( i, elem ) {
        if ( elem.src ) {
                jQuery.ajax({
@@ -731,10 +781,10 @@ function access( elems, key, value, exec, fn, pass ) {
        // Setting one attribute
        if ( value !== undefined ) {
                // Optionally, function values get executed if exec is true
-               exec = exec && jQuery.isFunction(value);
+               exec = !pass && exec && jQuery.isFunction(value);
                
                for ( var i = 0; i < length; i++ ) {
-                       fn( elems[i], key, exec ? value.call( elems[i], i ) : value, pass );
+                       fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
                }
                
                return elems;