Merge branch 'fix/gs-emoji-error' into 'develop'

Suppress emoji fetch error on gs. See merge request pleroma/pleroma-fe!183
2017-12-07 21:42:00 +00:00 · 2017-12-07 21:42:00 +00:00 · fe269b2cf9
parent 855f8b4f27 1db1529dec
commit fe269b2cf9
1 changed files with 13 additions and 7 deletions
--- a/src/main.js
+++ b/src/main.js
@ -129,10 +129,16 @@ window.fetch('/static/terms-of-service.html')
  })

 window.fetch('/api/pleroma/emoji.json')
-  .then((res) => res.json())
-  .then((values) => {
-    const emoji = Object.keys(values).map((key) => {
-      return { shortcode: key, image_url: values[key] }
-    })
-    store.dispatch('setOption', { name: 'emoji', value: emoji })
-  })
+  .then(
+    (res) => res.json()
+      .then(
+        (values) => {
+          const emoji = Object.keys(values).map((key) => {
+            return { shortcode: key, image_url: values[key] }
+          })
+          store.dispatch('setOption', { name: 'emoji', value: emoji })
+        },
+        (failure) => {}
+      ),
+    (error) => console.log(error)
+  )