Merge branch 'andrewcarreiro-errorCatch'

9 years ago · 5f9af34aee
4 changed files with 6114 additions and 0 deletions
--- a/resemble.js
+++ b/resemble.js
@ -148,7 +148,14 @@ URL: https://github.com/Huddle/Resemble.js
 				hiddenImage.setAttribute('crossorigin', 'anonymous');
 			}
 			hiddenImage.onerror = function () { 
 				hiddenImage.onerror = null; //fixes pollution between calls
 				images.push({ error : "Image load error."});
 				callback(); 
 			};
 			hiddenImage.onload = function() {
 				hiddenImage.onload = null; //fixes pollution between calls
 				var hiddenCanvas =  document.createElement('canvas');
 				var imageData;
@ -532,6 +539,12 @@ URL: https://github.com/Huddle/Resemble.js
 				var width;
 				var height;
 				if(images.length === 2){
 					if( images[0].error || images[1].error ){
 						data = {};
 						data.error = images[0].error ?  images[0].error : images[1].error;
 						triggerDataUpdate();
 						return;
 					}
 					width = images[0].width > images[1].width ? images[0].width : images[1].width;
 					height = images[0].height > images[1].height ? images[0].height : images[1].height;
--- a/tests/chai-3.4.2.js
+++ b/tests/chai-3.4.2.js
--- a/tests/main_spec.js
+++ b/tests/main_spec.js
--- a/tests/test.html
+++ b/tests/test.html
@ -0,0 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
 	<title></title>
 </head>
 <body>
 <p>Check the console for test results</p>
 <script src="../resemble.js"></script>
 <script src="chai-3.4.2.js"></script>
 <script src="main_spec.js"></script>
 </body>
 </html>