Merge branch 'memory-fixes'

streamlink · Feb 6, 2016 · 44b6942 · 44b6942
2 parents be4cf7e + c5ba74b
commit 44b6942
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/src/app/components/PreviewImageComponent.js b/src/app/components/PreviewImageComponent.js
@@ -16,9 +16,24 @@ define([
 
 		checkError: function() {
 			var self = this;
-			this.$( "img" ).one( "error", function() {
+			var img  = this.element.querySelector( "img" );
+
+			function unbind() {
+				img.removeEventListener( "error", onError, false );
+				img.removeEventListener( "load",  onLoad,  false );
+			}
+
+			function onError() {
+				unbind();
 				set( self, "error", true );
-			});
+			}
+
+			function onLoad() {
+				unbind();
+			}
+
+			img.addEventListener( "error", onError, false );
+			img.addEventListener( "load",  onLoad,  false );
 		}.on( "willInsertElement" )
 	});
 

diff --git a/src/app/utils/preload.js b/src/app/utils/preload.js
@@ -16,9 +16,23 @@ define( [ "Ember" ], function( Ember ) {
 
 			var defer = Promise.defer();
 			var image = new Image();
-			image.addEventListener( "load", defer.resolve, false );
-			image.addEventListener( "error", withError ? defer.reject : defer.resolve, false );
+
+			image.addEventListener( "load", function() {
+				image = null;
+				defer.resolve();
+			}, false );
+
+			image.addEventListener( "error", function() {
+				image = null;
+				if ( withError ) {
+					defer.reject();
+				} else {
+					defer.resolve();
+				}
+			}, false );
+
 			image.src = src;
+
 			return defer.promise;
 		}