summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Christopher Anderson <jchris@apache.org>2010-07-23 04:17:38 +0000
committerJohn Christopher Anderson <jchris@apache.org>2010-07-23 04:17:38 +0000
commit9c9a2c59d3e88cba80ee771aef52a064d76a629c (patch)
tree8ad14b77d9e3269893fe11d36314ef6ab73a4ead
parente056188adedf711c08355ecfcec2064716538745 (diff)
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
-rw-r--r--share/www/script/jquery.couch.js6
1 files changed, 3 insertions, 3 deletions
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) {