clean up handlers on xhrs correctly

mattbis · Apr 25, 2016 · 85f6a23 · 85f6a23
1 parent f4c3894
commit 85f6a23
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/lib/texture.js b/lib/texture.js
@@ -1243,7 +1243,7 @@ module.exports = function createTextureSet (gl, extensions, limits, reglPoll, vi
       })
     }
 
-    function refresh () {
+    function onData () {
       // Update size of any newly loaded pixels
       for (var i = 0; i < pixels.length; ++i) {
         var pixelData = pixels[i]
@@ -1264,25 +1264,28 @@ module.exports = function createTextureSet (gl, extensions, limits, reglPoll, vi
         }
       }
       checkTextureComplete(params, pixels)
-      texture.refresh()
+      refresh(texture)
     }
 
     pixels.forEach(function (pixelData) {
       if (pixelData.image && !pixelData.image.complete) {
-        pixelData.image.addEventListener('load', refresh)
+        pixelData.image.addEventListener('load', onData)
       } else if (pixelData.video && pixelData.readyState < 1) {
-        pixelData.video.addEventListener('progress', refresh)
+        pixelData.video.addEventListener('progress', onData)
       } else if (pixelData.xhr) {
-        pixelData.xhr.addEventListener('readystatechange', refresh)
+        pixelData.xhr.addEventListener('readystatechange', onData)
       }
     })
 
     texture.cancelPending = function detachListeners () {
       pixels.forEach(function (pixelData) {
         if (pixelData.image) {
-          pixelData.image.removeEventListener('load', refresh)
+          pixelData.image.removeEventListener('load', onData)
         } else if (pixelData.video) {
-          pixelData.video.removeEventListener('progress', refresh)
+          pixelData.video.removeEventListener('progress', onData)
+        } else if (pixelData.xhr) {
+          pixelData.xhr.removeEventListener('readystatechange', onData)
+          pixelData.xhr.abort()
         }
       })
     }