From b7fd889fcd5004739eaf4fb8ad60bce0a8b43d8e Mon Sep 17 00:00:00 2001 From: orangemug Date: Sun, 23 Sep 2018 21:00:17 +0100 Subject: [PATCH] Removed signal from fetch as not supported in all browsers. --- src/components/modals/OpenModal.jsx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/modals/OpenModal.jsx b/src/components/modals/OpenModal.jsx index 065704ed..85794e3d 100644 --- a/src/components/modals/OpenModal.jsx +++ b/src/components/modals/OpenModal.jsx @@ -76,10 +76,9 @@ class OpenModal extends React.Component { onStyleSelect = (styleUrl) => { this.clearError(); - const requestController = new AbortController(); + let canceled; const activeRequest = fetch(styleUrl, { - signal: requestController.signal, mode: 'cors', credentials: "same-origin" }) @@ -87,6 +86,10 @@ class OpenModal extends React.Component { return response.json(); }) .then((body) => { + if(canceled) { + return; + } + this.setState({ activeRequest: null, activeRequestUrl: null @@ -107,7 +110,11 @@ class OpenModal extends React.Component { }) this.setState({ - activeRequest: requestController, + activeRequest: { + abort: function() { + canceled = true; + } + }, activeRequestUrl: styleUrl }) }