@@ -237,7 +237,7 @@ export const makeRequest = function(requestParameters: RequestParameters, abortC
237237 }
238238 if ( ! isFileURL ( requestParameters . url ) ) {
239239 if ( fetch && Request && AbortController && Object . prototype . hasOwnProperty . call ( Request . prototype , 'signal' ) ) {
240- return silenceOnAbort ( makeFetchRequest ( requestParameters , abortController ) , abortController ) ;
240+ return makeFetchRequest ( requestParameters , abortController ) ;
241241 }
242242 if ( isWorker ( self ) && self . worker && self . worker . actor ) {
243243 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
246246 return makeXMLHttpRequest ( requestParameters , abortController ) ;
247247} ;
248248
249- // This needs to be removed in general, see #3308
250- function silenceOnAbort < T > ( promise : Promise < T > , abortController : AbortController ) : Promise < T > {
251- return new Promise ( ( resolve , reject ) => {
252- promise
253- . then ( result => { if ( ! abortController . signal . aborted ) resolve ( result ) ; } )
254- . catch ( error => { if ( ! abortController . signal . aborted ) reject ( error ) ; } ) ;
255- } ) ;
256- }
257-
258249export const getJSON = < T > ( requestParameters : RequestParameters , abortController : AbortController ) : Promise < { data : T } & ExpiryData > => {
259250 return makeRequest ( extend ( requestParameters , { type : 'json' } ) , abortController ) ;
260251} ;
0 commit comments