From 870cc0055bb9bcbb9109932e1428bb872416bea8 Mon Sep 17 00:00:00 2001 From: Krishna Acondy Date: Thu, 13 Aug 2020 21:07:21 +0100 Subject: [PATCH] fix(*): use fetch polyfill in Firefox 60 --- src/SASjs.ts | 4 ++-- src/utils/isIeOrEdge.ts | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/SASjs.ts b/src/SASjs.ts index 28f0fe8..8ab8daf 100644 --- a/src/SASjs.ts +++ b/src/SASjs.ts @@ -1,6 +1,6 @@ import * as e6p from "es6-promise"; (e6p as any).polyfill(); -if (isIEorEDGE()) { +if (isIEorEdgeOrFirefox60()) { window.fetch = undefined as any; // ensure the polyfill runs } // tslint:disable-next-line @@ -31,7 +31,7 @@ import { import { SASViyaApiClient } from "./SASViyaApiClient"; import { SAS9ApiClient } from "./SAS9ApiClient"; import { FileUploader } from "./FileUploader"; -import { isIEorEDGE } from "./utils/isIeOrEdge"; +import { isIEorEdgeOrFirefox60 } from "./utils/isIeOrEdge"; const defaultConfig: SASjsConfig = { serverUrl: "", diff --git a/src/utils/isIeOrEdge.ts b/src/utils/isIeOrEdge.ts index 7dc4eea..33db0d8 100644 --- a/src/utils/isIeOrEdge.ts +++ b/src/utils/isIeOrEdge.ts @@ -1,6 +1,10 @@ -export function isIEorEDGE() { +export function isIEorEdgeOrFirefox60() { const ua = window.navigator.userAgent; + if (ua.indexOf("Firefox/60") > 0) { + return true; + } + const msie = ua.indexOf("MSIE "); if (msie > 0) { // IE 10 or older => return version number