diff --git a/src/util/ajax.ts b/src/util/ajax.ts index 8d72c51f97..e2d3d234fc 100644 --- a/src/util/ajax.ts +++ b/src/util/ajax.ts @@ -237,7 +237,7 @@ export const makeRequest = function(requestParameters: RequestParameters, abortC } if (!isFileURL(requestParameters.url)) { if (fetch && Request && AbortController && Object.prototype.hasOwnProperty.call(Request.prototype, 'signal')) { - return silenceOnAbort(makeFetchRequest(requestParameters, abortController), abortController); + return makeFetchRequest(requestParameters, abortController); } if (isWorker(self) && self.worker && self.worker.actor) { return self.worker.actor.sendAsync({type: 'getResource', data: requestParameters, mustQueue: true, targetMapId: GLOBAL_DISPATCHER_ID}, abortController); @@ -246,15 +246,6 @@ export const makeRequest = function(requestParameters: RequestParameters, abortC return makeXMLHttpRequest(requestParameters, abortController); }; -// This needs to be removed in general, see #3308 -function silenceOnAbort(promise: Promise, abortController: AbortController): Promise { - return new Promise((resolve, reject) => { - promise - .then(result => { if (!abortController.signal.aborted) resolve(result); }) - .catch(error => { if (!abortController.signal.aborted) reject(error); }); - }); -} - export const getJSON = (requestParameters: RequestParameters, abortController: AbortController): Promise<{data: T} & ExpiryData> => { return makeRequest(extend(requestParameters, {type: 'json'}), abortController); };