You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2009/08/26 18:15:09 UTC

svn commit: r808091 - /incubator/shindig/trunk/features/src/main/javascript/features/core/json.js

Author: lindner
Date: Wed Aug 26 16:15:08 2009
New Revision: 808091

URL: http://svn.apache.org/viewvc?rev=808091&view=rev
Log:
SHINDIG-1148 | more precise test for using built-in windows.JSON | patch from nov matake

Modified:
    incubator/shindig/trunk/features/src/main/javascript/features/core/json.js

Modified: incubator/shindig/trunk/features/src/main/javascript/features/core/json.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/core/json.js?rev=808091&r1=808090&r2=808091&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/core/json.js (original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/core/json.js Wed Aug 26 16:15:08 2009
@@ -40,7 +40,7 @@
  * Port of the public domain JSON library by Douglas Crockford.
  * See: http://www.json.org/json2.js
  */
-if (window.JSON) {
+if (window.JSON && window.JSON.parse && window.JSON.stringify) {
   // HTML5 implementation, or already defined.
   // Not a direct alias as the opensocial specification disagrees with the HTML5 JSON spec.
   // JSON says to throw on parse errors and to support filtering functions. OS does not.