From 8b7bec116df1c03e9b39458f16ba5d395ea9db7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20J=C3=B6nsson?= Date: Fri, 16 Mar 2018 11:09:30 +0100 Subject: [PATCH] hotfix for firefox --- package.json | 2 +- src/fetchRemote.js | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 200b53d..7be6359 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fimfic2epub", - "version": "1.7.25", + "version": "1.7.26", "description": "Tool to generate improved EPUB ebooks from Fimfiction stories", "author": "djazz", "license": "MIT", diff --git a/src/fetchRemote.js b/src/fetchRemote.js index f380664..df681b8 100644 --- a/src/fetchRemote.js +++ b/src/fetchRemote.js @@ -59,10 +59,13 @@ function fetchBackground (url, responseType) { export default function fetchRemote (url, responseType) { if (url.startsWith('//')) { - url = 'http:' + url + url = 'https:' + url } - if (!isNode) { + if (!isNode && document.location.protocol === 'https:' && url.startsWith('http:')) { return fetchBackground(url, responseType) } - return fetch(url, responseType) + return fetch(url, responseType).then((data) => { + if (!data) return fetchBackground(url, responseType) + else return Promise.resolve(data) + }) }