logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: b98a6fe5bc486f07d4b8d5a9dd3fedd6bf4b7b66
parent: e81b3ea245c650377126242d928bd96ea64ec0a4
Author: Roger Braun <roger@rogerbraun.net>
Date:   Fri, 20 Jan 2017 23:58:58 +0100

Fix file uploads in Chrome.

Diffstat:

Msrc/services/status_poster/status_poster.service.js17++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js @@ -20,12 +20,23 @@ const uploadMedia = ({ store, formData }) => { const credentials = store.state.users.currentUser.credentials return apiService.uploadMedia({ credentials, formData }).then((xml) => { - return { + // Firefox and Chrome treat method differently... + let link = xml.getElementsByTagName('link') + + if (link.length === 0) { + link = xml.getElementsByTagName('atom:link') + } + + link = link[0] + + const mediaData = { id: xml.getElementsByTagName('media_id')[0].textContent, url: xml.getElementsByTagName('media_url')[0].textContent, - image: xml.getElementsByTagName('atom:link')[0].getAttribute('href'), - mimetype: xml.getElementsByTagName('atom:link')[0].getAttribute('type') + image: link.getAttribute('href'), + mimetype: link.getAttribute('type') } + + return mediaData }) }