XHR: Interpret status 0 (usually when server unreachable) as error an…

…d actually fire error event.
moxiecode · Feb 24, 2013 · 752174d · 752174d
1 parent 27204a1
commit 752174d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/bin/js/moxie.js b/bin/js/moxie.js
@@ -3909,7 +3909,7 @@ define("moxie/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 || _xhr.status >= 400) {
+						if (_xhr.status === 0) {
 							_error_flag = true;
 							self.dispatchEvent('error');
 						} else {
@@ -3982,12 +3982,16 @@ define("moxie/xhr/XMLHttpRequest", [
 					} else if (_p('responseType') === 'document') {
 						_p('responseXML', _p('response'));
 					}
-
-					if (_upload_events_flag) {
-						self.upload.trigger(e);
-					}
 
-					self.trigger(e);
+					if (_p('status') > 0) { // status 0 usually means that server is unreachable
+						if (_upload_events_flag) {
+							self.upload.trigger(e);
+						}
+						self.trigger(e);
+					} else {
+						_error_flag = true;
+						self.dispatchEvent('error');
+					}
 					self.trigger('loadend');
 				});
 
@@ -8976,7 +8980,11 @@ define("moxie/runtime/html4/xhr/XMLHttpRequest", [
 				if ('json' === responseType) {
 					// strip off <pre>..</pre> tags that might be enclosing the response
 					if (Basic.typeOf(_response) === 'string') {
-						return parseJSON(_response.replace(/^\s*<pre[^>]*>/, '').replace(/<\/pre>\s*$/, ''));
+						try {
+							return parseJSON(_response.replace(/^\s*<pre[^>]*>/, '').replace(/<\/pre>\s*$/, ''));
+						} catch (ex) {
+							return null;
+						}
 					} 
 				} else if ('document' === responseType) {