LoadingManager: New abort approach.

Author: Mugen87

src/loaders/FileLoader.js

@@ -129,7 +129,7 @@ class FileLoader extends Loader {
 		const req = new Request( url, {
 			headers: new Headers( this.requestHeader ),
 			credentials: this.withCredentials ? 'include' : 'same-origin',
-			signal: this._abortController.signal
+			signal: AbortSignal.any( [ this._abortController.signal, this.manager.abortController.signal ] )
 		} );
 
 		// record states ( avoid data race )

src/loaders/ImageBitmapLoader.js

@@ -162,7 +162,7 @@ class ImageBitmapLoader extends Loader {
 		const fetchOptions = {};
 		fetchOptions.credentials = ( this.crossOrigin === 'anonymous' ) ? 'same-origin' : 'include';
 		fetchOptions.headers = this.requestHeader;
-		fetchOptions.signal = this._abortController.signal;
+		fetchOptions.signal = AbortSignal.any( [ this._abortController.signal, this.manager.abortController.signal ] );
 
 		const promise = fetch( url, fetchOptions ).then( function ( res ) {
 

src/loaders/Loader.js

@@ -61,14 +61,6 @@ class Loader {
 		 */
 		this.requestHeader = {};
 
-		//
-
-		if ( this.manager.enableAbortManagement === true ) {
-
-			this.manager.addEventListener( 'abort', () => this.abort() );
-
-		}
-
 	}
 
 	/**

src/loaders/LoadingManager.js

@@ -1,13 +1,3 @@
-import { EventDispatcher } from '../core/EventDispatcher.js';
-
-/**
- * Fires when {@link LoadingManager#abort} is called.
- *
- * @event LoadingManager#abort
- * @type {Object}
- */
-const _abort = { type: 'abort' };
-
 /**
  * Handles and keeps track of loaded and pending data. A default global
  * instance of this class is created and used by loaders if not supplied
@@ -25,7 +15,7 @@ const _abort = { type: 'abort' };
  * const loader2 = new ColladaLoader( manager );
  * ```
  */
-class LoadingManager extends EventDispatcher {
+class LoadingManager {
 
 	/**
 	 * Constructs a new loading manager.
@@ -36,8 +26,6 @@ class LoadingManager extends EventDispatcher {
 	 */
 	constructor( onLoad, onProgress, onError ) {
 
-		super();
-
 		const scope = this;
 
 		let isLoading = false;
@@ -82,12 +70,11 @@ class LoadingManager extends EventDispatcher {
 		this.onError = onError;
 
 		/**
-		 * Whether loading requests can be aborted with {@link LoadingManager#abort} or not.
+		 * Used for aborting ongoing requests in loaders using this manager.
 		 *
-		 * @type {boolean}
-		 * @default false
+		 * @type {AbortController}
 		 */
-		this.enableAbortManagement = false;
+		this.abortController = new AbortController();
 
 		/**
 		 * This should be called by any loader using the manager when the loader
@@ -291,15 +278,15 @@ class LoadingManager extends EventDispatcher {
 
 		/**
 		 * Can be used to abort ongoing loading requests in loaders using this manager.
-		 * The abort only works if {@link LoadingManager#enableAbortManagement} is set
-		 * to `true` and the loaders implement {@link Loader#abort}.
+		 * The abort only works if the loaders implement {@link Loader#abort}.
 		 *
 		 * @fires LoadingManager#abort
 		 * @return {LoadingManager} A reference to this loading manager.
 		 */
 		this.abort = function () {
 
-			this.dispatchEvent( _abort );
+			this.abortController.abort();
+			this.abortController = new AbortController();
 
 			return this;