Revert r28, commit was incomplete

Krinkle · Krinkle · commit 6e6ada9abfaf · 2011-09-18T02:09:27.000Z
diff --git a/src/jquery.json.js b/src/jquery.json.js
@@ -52,7 +52,7 @@
 			return undefined;
 		}
 		if ( type === 'number' || type === 'boolean' ) {
-			return '' + o;
+			return o + '';
 		}
 		if ( type === 'string') {
 			return $.quoteString( o );
@@ -96,17 +96,16 @@
 					'.' + milli + 'Z"';
 			}
 			if ( o.constructor === Array ) {
-				var ret = [], i = 0;
-				for ( ; i < o.length; i++ ) {
+				var ret = [];
+				for ( var i = 0; i < o.length; i++ ) {
 					ret.push( $.toJSON( o[i] ) || 'null' );
 				}
 				return '[' + ret.join(',') + ']';
 			}
 			var	name,
 				val,
-				k,
 				pairs = [];
-			for ( k in o ) {
+			for ( var k in o ) {
 				type = typeof k;
 				if ( type === 'number' ) {
 					name = '"' + k + '"';
@@ -155,7 +154,7 @@
 			return JSON.parse( src );
 		}
 
-		var filtered =
+		var filtered = 
 			src
 			.replace( /\\["\\\/bfnrtu]/g, '@' )
 			.replace( /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
diff --git a/src/jquery.json.min.js b/src/jquery.json.min.js
@@ -2,7 +2,7 @@
 (function($){var escapeable=/["\\\x00-\x1f\x7f-\x9f]/g,meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};$.toJSON=function(o){if(typeof JSON==='object'&&JSON.stringify){return JSON.stringify(o);}
 var type=typeof o;if(o===null){return'null';}
 if(type==='undefined'){return undefined;}
-if(type==='number'||type==='boolean'){return''+o;}
+if(type==='number'||type==='boolean'){return o+'';}
 if(type==='string'){return $.quoteString(o);}
 if(type==='object'){if(typeof o.toJSON==='function'){return $.toJSON(o.toJSON());}
 if(o.constructor===Date){var month=o.getUTCMonth()+1,day=o.getUTCDate(),year=o.getUTCFullYear(),hours=o.getUTCHours(),minutes=o.getUTCMinutes(),seconds=o.getUTCSeconds(),milli=o.getUTCMilliseconds();if(month<10){month='0'+month;}
@@ -14,9 +14,9 @@ if(milli<100){milli='0'+milli;}
 if(milli<10){milli='0'+milli;}
 return'"'+year+'-'+month+'-'+day+'T'+
 hours+':'+minutes+':'+seconds+'.'+milli+'Z"';}
-if(o.constructor===Array){var ret=[],i=0;for(;i<o.length;i++){ret.push($.toJSON(o[i])||'null');}
+if(o.constructor===Array){var ret=[];for(var i=0;i<o.length;i++){ret.push($.toJSON(o[i])||'null');}
 return'['+ret.join(',')+']';}
-var name,val,k,pairs=[];for(k in o){type=typeof k;if(type==='number'){name='"'+k+'"';}else if(type==='string'){name=$.quoteString(k);}else{continue;}
+var name,val,pairs=[];for(var k in o){type=typeof k;if(type==='number'){name='"'+k+'"';}else if(type==='string'){name=$.quoteString(k);}else{continue;}
 type=typeof o[k];if(type==='function'||type==='undefined'){continue;}
 val=$.toJSON(o[k]);pairs.push(name+':'+val);}
 return'{'+pairs.join(',')+'}';}};$.evalJSON=function(src){if(typeof JSON==='object'&&JSON.parse){return JSON.parse(src);}
diff --git a/test/jquery.json.test.js b/test/jquery.json.test.js
@@ -173,53 +173,3 @@ test( 'Undefined and null', function(){
 
 
 });
-
-
-// Utility function
-function testEvalJSON( string, json, description ) {
-	// deepEqual traverses an object's members,
-	// this is needed because a simple == comparison doesn't
-	// work because objects are comparsed by reference, not by value.
-	// For example [1,2,3] == [1,2,3] returns false  :)
-	deepEqual( $.evalJSON( string ), json, description );
-}
-
-module( 'jQuery.evalJSON' );
-
-test( 'Basic', function(){
-
-	testEvalJSON(
-		'"hi"',
-		"hi",
-		'Simple string'
-	);
-	testEvalJSON(
-		'{"apple":2}',
-		{"apple":2},
-		'Object'
-	);
-	testEvalJSON(
-		'{"apple":{"apple":2}}',
-		{"apple":{"apple":2}},
-		'Objects inside objects'
-	);
-	testEvalJSON(
-		'{"apple":7,"pear":5}',
-		{"apple":7,"pear":5},
-		'Objects with multiple members'
-	);
-
-});
-
-test( 'Invalid input', function(){
-
-	raises(
-		function(){
-			$.evalJSON( '{ "foo": \'100\' }' );
-		},
-		SyntaxError,
-		'Single quotes are invalid, the should throw a syntax error.'
-	);
-
-
-});
