Adding and fixing case "multiple object members".

Krinkle · Krinkle · commit 0fea7d7545df · 2011-09-18T00:43:39.000Z
* A space sneaked into the join() command, removing here to match the test case
* Rebuilding .min.js
diff --git a/src/jquery.json.js b/src/jquery.json.js
@@ -123,7 +123,7 @@
 				val = $.toJSON( o[k] );
 				pairs.push(name + ':' + val);
 			}
-			return '{' + pairs.join(', ') + '}';
+			return '{' + pairs.join(',') + '}';
 		}
 	};
 
diff --git a/src/jquery.json.min.js b/src/jquery.json.min.js
@@ -19,7 +19,7 @@ return'['+ret.join(',')+']';}
 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;}
 if(typeof o[k]==='function'){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);}
+return'{'+pairs.join(',')+'}';}};$.evalJSON=function(src){if(typeof JSON==='object'&&JSON.parse){return JSON.parse(src);}
 return eval('('+src+')');};$.secureEvalJSON=function(src){if(typeof JSON==='object'&&JSON.parse){return JSON.parse(src);}
 var filtered=src.replace(/\\["\\\/bfnrtu]/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,'');if(/^[\],:{}\s]*$/.test(filtered)){return eval('('+src+')');}else{throw new SyntaxError('Error parsing JSON, source is not valid.');}};$.quoteString=function(string){if(string.match(escapeable)){return'"'+string.replace(escapeable,function(a){var c=meta[a];if(typeof c==='string'){return c;}
 c=a.charCodeAt();return'\\u00'+Math.floor(c/16).toString(16)+(c%16).toString(16);})+'"';}
diff --git a/test/jquery.json.test.js b/test/jquery.json.test.js
@@ -27,6 +27,11 @@ test( 'Basic toJSON usage', function(){
 		'{"apple":{"apple":2}}',
 		'Objects inside objects'
 	);
+	equalJSON(
+		{ apple: 7, pear: 5 },
+		'{"apple":7,"pear":5}',
+		'Objects with multiple members should be separated by a comma'
+	);
 	equalJSON(
 		2.5,
 		'2.5',

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@`
`123`	`123`	`val = $.toJSON( o[k] );`
`124`	`124`	`pairs.push(name + ':' + val);`
`125`	`125`	`}`
`126`		`- return '{' + pairs.join(', ') + '}';`
	`126`	`+ return '{' + pairs.join(',') + '}';`
`127`	`127`	`}`
`128`	`128`	`};`
`129`	`129`