From 7da0274de653584bc1f9b16a8341b5ffcabe5fa9 Mon Sep 17 00:00:00 2001 From: Otto Chrons Date: Sat, 21 Feb 2015 17:54:05 +0200 Subject: [PATCH 1/2] Added a method to AjaxException to check for timeout status. Change-Id: Ia0d66bd4ca27f2ce0157258bcc885817efe21a2f --- src/main/scala/org/scalajs/dom/ext/Extensions.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/scala/org/scalajs/dom/ext/Extensions.scala b/src/main/scala/org/scalajs/dom/ext/Extensions.scala index c8300f4a6..5d5bad09d 100644 --- a/src/main/scala/org/scalajs/dom/ext/Extensions.scala +++ b/src/main/scala/org/scalajs/dom/ext/Extensions.scala @@ -154,9 +154,12 @@ object KeyCode { import scala.concurrent.{Promise, Future} /** * Thrown when `Ajax.get` or `Ajax.post` receives a non-20X response code. - * Contains the XMLHttpRequest that resulted in that respons + * Contains the XMLHttpRequest that resulted in that response */ -case class AjaxException(xhr: dom.XMLHttpRequest) extends Exception +case class AjaxException(xhr: dom.XMLHttpRequest) extends Exception { + def timeout = xhr.status == 0 && xhr.readyState == 4 +} + /** * Wraps an XMLHttpRequest to provide an easy one-line way of making * an Ajax call, returning a Future. From 94c8bc6ec66557a351d641f498367a191b1a4441 Mon Sep 17 00:00:00 2001 From: Otto Chrons Date: Sat, 21 Feb 2015 18:29:50 +0200 Subject: [PATCH 2/2] Update Extensions.scala --- src/main/scala/org/scalajs/dom/ext/Extensions.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/org/scalajs/dom/ext/Extensions.scala b/src/main/scala/org/scalajs/dom/ext/Extensions.scala index 5d5bad09d..be6c8159a 100644 --- a/src/main/scala/org/scalajs/dom/ext/Extensions.scala +++ b/src/main/scala/org/scalajs/dom/ext/Extensions.scala @@ -157,7 +157,7 @@ import scala.concurrent.{Promise, Future} * Contains the XMLHttpRequest that resulted in that response */ case class AjaxException(xhr: dom.XMLHttpRequest) extends Exception { - def timeout = xhr.status == 0 && xhr.readyState == 4 + def isTimeout = xhr.status == 0 && xhr.readyState == 4 } /**