Add fix issue 50 (Object for loop should filter with obj.hasOwnProperty(key))

Krinkle · Krinkle · commit 9c99454e648c · 2011-09-18T20:06:15.000Z
* Follows-up r37, r36
* Re-order some comments
* Rebuild .min.js
* Bump version to 2.3-edge
diff --git a/src/jquery.json.js b/src/jquery.json.js
@@ -1,5 +1,5 @@
 /**
- * jQuery JSON Plugin v2.3 (2011-09-17)
+ * jQuery JSON Plugin v2.3-edge (2011-09-18)
  *
  * @author Brantley Harris, 2009-2011
  * @author Timo Tijhof, 2011
@@ -104,21 +104,27 @@
 				val,
 				pairs = [];
 			for ( var k in o ) {
+				// Only include own properties,
+				// Filter out inherited prototypes
+				if ( !o.hasOwnProperty( k ) ) {
+					continue;
+				}
+
+				// Keys must be numerical or string. Skip others
 				type = typeof k;
 				if ( type === 'number' ) {
 					name = '"' + k + '"';
 				} else if (type === 'string') {
 					name = $.quoteString(k);
 				} else {
-					// Keys must be numerical or string. Skip others
 					continue;
 				}
 				type = typeof o[k];
 
+				// Invalid values like these return undefined
+				// from toJSON, however those object members
+				// shouldn't be included in the JSON string at all.
 				if ( type === 'function' || type === 'undefined' ) {
-					// Invalid values like these return undefined
-					// from toJSON, however those object members
-					// shouldn't be included in the JSON string at all.
 					continue;
 				}
 				val = $.toJSON( o[k] );
diff --git a/src/jquery.json.min.js b/src/jquery.json.min.js
@@ -15,7 +15,8 @@ return'"'+year+'-'+month+'-'+day+'T'+
 hours+':'+minutes+':'+seconds+'.'+milli+'Z"';}
 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,pairs=[];for(var 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){if(!o.hasOwnProperty(k)){continue;}
+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=typeof JSON==='object'&&JSON.parse?JSON.parse:function(src){return eval('('+src+')');};$.secureEvalJSON=typeof JSON==='object'&&JSON.parse?JSON.parse:function(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;}
