From 76f6226ee749d57bd767a14ec5b1bece0686279b Mon Sep 17 00:00:00 2001
From: John Christopher Anderson <jchris@apache.org>
Date: Fri, 23 Jul 2010 04:18:24 +0000
Subject: 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/branches/1.0.x@966958 13f79535-47bb-0310-9956-ffa450edef68
---
 share/www/script/jquery.couch.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'share')

diff --git a/share/www/script/jquery.couch.js b/share/www/script/jquery.couch.js
index 879c2444..ebf7d52a 100644
--- a/share/www/script/jquery.couch.js
+++ b/share/www/script/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) {
-- 
cgit v1.2.3