From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 11 Dec 2016 22:18:41 +0000 (+0100)
Subject: Fix #203 - try/catch around JSON parse
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f92cb02b9bc4b6b09c48dee72ac3a9f0de213dc3;p=mastodon.git

Fix #203 - try/catch around JSON parse
---

diff --git a/app/assets/javascripts/components/api.jsx b/app/assets/javascripts/components/api.jsx
index 080c2bd6a..93cfc8046 100644
--- a/app/assets/javascripts/components/api.jsx
+++ b/app/assets/javascripts/components/api.jsx
@@ -17,6 +17,10 @@ export default getState => axios.create({
   },
 
   transformResponse: [function (data) {
-    return JSON.parse(data);
+    try {
+      return JSON.parse(data);
+    } catch(Exception) {
+      return data;
+    }
   }]
 });