Unable to abort RawImageLoader requests ivmartel#583

frickt · Oct 11, 2018 · efe99a6 · efe99a6
1 parent 2942679
commit efe99a6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/app/application.js b/src/app/application.js
@@ -1311,7 +1311,7 @@ dwv.App = function ()
     function handleAbort(error)
     {
         // log
-        if ( error.message ) {
+        if ( error &&  error.message ) {
             console.warn(error.message);
         }
         else {

diff --git a/src/io/rawImageLoader.js b/src/io/rawImageLoader.js
@@ -10,6 +10,12 @@ dwv.io.RawImageLoader = function ()
     // closure to self
     var self = this;
 
+    /**
+     * if abort is triggered, all image.onload callbacks have to be cancelled
+     * @type {boolean}
+     */
+    var aborted = false;
+
     /**
      * Set the loader options.
      * @param {Object} opt The input options.
@@ -55,6 +61,7 @@ dwv.io.RawImageLoader = function ()
      * @param {Number} index The data index.
      */
     this.load = function ( dataUri, origin, index ) {
+        aborted = false;
         // create a DOM image
         var image = new Image();
         image.src = dataUri;
@@ -64,7 +71,9 @@ dwv.io.RawImageLoader = function ()
         // triggered by ctx.drawImage
         image.onload = function (/*event*/) {
             try {
-                self.onload( dwv.image.getViewFromDOMImage(this) );
+                if(!aborted){
+                    self.onload( dwv.image.getViewFromDOMImage(this) );
+                }
                 self.onloadend();
             } catch (error) {
                 self.onerror(error);
@@ -78,6 +87,7 @@ dwv.io.RawImageLoader = function ()
      * Abort load. TODO...
      */
     this.abort = function () {
+        aborted = true;
         self.onabort();
     };
 

diff --git a/src/io/urlsLoader.js b/src/io/urlsLoader.js
@@ -109,7 +109,7 @@ dwv.io.UrlsLoader = function ()
         // abort requests
         for ( var i = 0; i < requests.length; ++i ) {
             // 0: UNSENT, 1: OPENED, 2: HEADERS_RECEIVED (send()), 3: LOADING, 4: DONE
-            if ( requests[i].readyState === 2 || requests[i].readyState === 3 ) {
+            if ( requests[i].readyState !== 4 ) {
                 requests[i].abort();
             }
         }