Merge pull request #2 from zerko/master

Per request timeouts

2 files changed, 9 insertions, 2 deletions

diff --git a/README b/README
index a330340..eeff1e1 100644
--- a/README
+++ b/README
@@ -119,6 +119,10 @@ Properties of Request Object:
     CORS request needs to have HTTP Cookies and/or HTTP Authentication
     information sent along with it.
 
+  timeout: integer
+    Request wait timeout in milliseconds.
+    Default 60000.
+
 Retries:
 
   When a request fails at the transport level, or the request succeeds with an
diff --git a/pollymer.js b/pollymer.js
index 72b4b46..ddeda70 100644
--- a/pollymer.js
+++ b/pollymer.js
@@ -9,7 +9,6 @@ var DEBUG = true;
 (function (window, undefined) {
 
     var NAMESPACE = "Pollymer";
-    var TIMEOUT = 60000;
     var emptyMethod = function () { };
 
     var consoleInfo;
@@ -206,6 +205,7 @@ var DEBUG = true;
         this.maxDelay = 1000;
         this.recurring = false;
         this.withCredentials = false;
+        this.timeout = 60000
 
         if (arguments.length > 0) {
             var config = arguments[0];
@@ -227,6 +227,9 @@ var DEBUG = true;
             if ("withCredentials" in config) {
                 this.withCredentials = config.withCredentials;
             }
+            if ("timeout" in config) {
+                this.timeout = config.timeout
+            }
         }
     };
     Request.prototype.start = function (method, url, headers, body) {
@@ -285,7 +288,7 @@ var DEBUG = true;
     };
     Request.prototype._startConnect = function () {
         var self = this;
-        this._timer = window.setTimeout(function () { self._timeout(); }, TIMEOUT);
+        this._timer = window.setTimeout(function () { self._timeout(); }, this.timeout);
 
         this._tries++;