couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [28/50] jquery-couch commit: updated refs/heads/import-master to 66dbcbf
Date Tue, 01 Apr 2014 08:52:33 GMT
Make the simple document versioning actually work. I have no idea how it passed my earlier
tests, maybe there was a regression.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@966957 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/couchdb-jquery-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jquery-couch/commit/fc742d92
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jquery-couch/tree/fc742d92
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jquery-couch/diff/fc742d92

Branch: refs/heads/import-master
Commit: fc742d92b424df0c71d4d82378290c8ae813ab3f
Parents: e5ca5fb
Author: John Christopher Anderson <jchris@apache.org>
Authored: Fri Jul 23 04:17:38 2010 +0000
Committer: Alexander Shorin <kxepal@gmail.com>
Committed: Fri Jul 23 04:17:38 2010 +0000

----------------------------------------------------------------------
 jquery.couch.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-jquery-couch/blob/fc742d92/jquery.couch.js
----------------------------------------------------------------------
diff --git a/jquery.couch.js b/jquery.couch.js
index b009af6..e8254fe 100644
--- a/jquery.couch.js
+++ b/jquery.couch.js
@@ -341,7 +341,7 @@
         openDoc: function(docId, options, ajaxOptions) {
           options = options || {};
           if (db_opts.attachPrevRev || options.attachPrevRev) {
-            $.extend(ajaxOptions, {
+            $.extend(options, {
               beforeSuccess : function(req, doc) {
                 rawDocs[doc._id] = {
                   rev : doc._rev,
@@ -350,7 +350,7 @@
               }
             });
           } else {
-            $.extend(ajaxOptions, {
+            $.extend(options, {
               beforeSuccess : function(req, doc) {
                 if (doc["jquery.couch.attachPrevRev"]) {
                   rawDocs[doc._id] = {
@@ -649,7 +649,7 @@
     var buf = [];
     if (typeof(options) === "object" && options !== null) {
       for (var name in options) {
-        if ($.inArray(name, ["error", "success", "ajaxStart"]) >= 0)
+        if ($.inArray(name, ["error", "success", "beforeSuccess", "ajaxStart"]) >= 0)
           continue;
         var value = options[name];
         if ($.inArray(name, ["key", "startkey", "endkey"]) >= 0) {


Mime
View raw message