[fusion-commits] r2591 - trunk/lib

[svn_fusion at osgeo.org]

Author: liuar
Date: 2012-09-13 23:18:01 -0700 (Thu, 13 Sep 2012)
New Revision: 2591

Modified:
   trunk/lib/fusion.js
Log:
Submit on behalf of Spark Liu: Fix ticket #542.


Modified: trunk/lib/fusion.js
===================================================================
--- trunk/lib/fusion.js	2012-09-12 03:18:49 UTC (rev 2590)
+++ trunk/lib/fusion.js	2012-09-14 06:18:01 UTC (rev 2591)
@@ -782,7 +782,7 @@
         */
         parseJSON: function(str) {
             var o;
-            if (typeof(JSON) != 'undefined') {
+            if (typeof(JSON) != 'undefined' && JSON.parse != null) {
                 o = JSON.parse(str);
             } else {
                 eval('o='+str); //TODO: Still evil for now, but the evil is localized to this one spot. Replace with a JSON.parse shim