XHR, HTML5: clarify onload logic for envs with no support for XHR2

t0xik1 · Aug 9, 2017 · 9cd5c00 · 9cd5c00
1 parent daed75c
commit 9cd5c00
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/javascript/runtime/html5/xhr/XMLHttpRequest.js b/src/javascript/runtime/html5/xhr/XMLHttpRequest.js
@@ -152,11 +152,14 @@ define("moxie/runtime/html5/xhr/XMLHttpRequest", [
 								_xhr.onreadystatechange = function() {};
 
 								// usually status 0 is returned when server is unreachable, but FF also fails to status 0 for 408 timeout
-								if (_xhr.status === 0) {
-									target.trigger('error');
-								} else {
-									target.trigger('load');
-								}							
+								try {
+									if (_xhr.status >= 200 && _xhr.status < 400) {
+										target.trigger('load');
+										break;
+									}
+								} catch(ex) {}
+
+								target.trigger('error');
 								break;
 						}
 					};