[25/51] [abbrv] futon commit: updated refs/heads/import-master to 53a86dd

[da...@apache.org]

jquery.couch.js: db.changes().stop() should abort XMLHTTPRequest


Project: http://git-wip-us.apache.org/repos/asf/couchdb-futon/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-futon/commit/38b61af8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-futon/tree/38b61af8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-futon/diff/38b61af8

Branch: refs/heads/import-master
Commit: 38b61af8585b4b2e5813466d2a99865b96ea2f5a
Parents: 493f700
Author: Fedor Indutny <fe...@gmail.com>
Authored: Tue Dec 10 17:29:16 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Dec 10 17:29:16 2013 +0400

----------------------------------------------------------------------
 script/jquery.couch.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-futon/blob/38b61af8/script/jquery.couch.js
----------------------------------------------------------------------
diff --git a/script/jquery.couch.js b/script/jquery.couch.js
index db4e8ef..1a4c3b7 100644
--- a/script/jquery.couch.js
+++ b/script/jquery.couch.js
@@ -412,6 +412,7 @@
           // set up the promise object within a closure for this handler
           var timeout = 100, db = this, active = true,
             listeners = [],
+            xhr = null,
             promise = /** @lends $.couch.db.changes */ {
               /**
                * Add a listener callback
@@ -428,6 +429,9 @@
                */
             stop : function() {
               active = false;
+              if (xhr){
+                xhr.abort();
+              }
             }
           };
           // call each listener when there is a change
@@ -458,7 +462,7 @@
               feed : "longpoll",
               since : since
             });
-            ajax(
+            xhr = ajax(
               {url: db.uri + "_changes"+encodeOptions(opts)},
               options,
               "Error connecting to "+db.uri+"/_changes."
@@ -976,7 +980,7 @@
     ajaxOptions = $.extend(defaultAjaxOpts, ajaxOptions);
     errorMessage = errorMessage || "Unknown error";
     timeStart = (new Date()).getTime();
-    $.ajax($.extend($.extend({
+    return $.ajax($.extend($.extend({
       type: "GET", dataType: "json", cache : maybeUseCache(),
       beforeSend: function(xhr){
         if(ajaxOptions && ajaxOptions.headers){