You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2011/02/15 14:33:16 UTC
svn commit: r1070885 -
/couchdb/branches/1.1.x/share/www/script/jquery.couch.js
Author: rnewson
Date: Tue Feb 15 13:33:16 2011
New Revision: 1070885
URL: http://svn.apache.org/viewvc?rev=1070885&view=rev
Log:
Only accept application/json from jquery.couch.js
Since Filipe's fix for parsing the accepted content types at r1041103, returns from
$.ajax could return a 302 that redirects to an HTML page. Functions like activeTasks()
expect JSON and barf when fed HTML.
Modified:
couchdb/branches/1.1.x/share/www/script/jquery.couch.js
Modified: couchdb/branches/1.1.x/share/www/script/jquery.couch.js
URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/share/www/script/jquery.couch.js?rev=1070885&r1=1070884&r2=1070885&view=diff
==============================================================================
--- couchdb/branches/1.1.x/share/www/script/jquery.couch.js [utf-8] (original)
+++ couchdb/branches/1.1.x/share/www/script/jquery.couch.js [utf-8] Tue Feb 15 13:33:16 2011
@@ -87,6 +87,9 @@
options = options || {};
$.ajax({
type: "GET", url: this.urlPrefix + "/_session",
+ beforeSend: function(xhr) {
+ xhr.setRequestHeader('Accept', 'application/json');
+ },
complete: function(req) {
var resp = $.httpData(req, "json");
if (req.status == 200) {
@@ -123,6 +126,9 @@
$.ajax({
type: "POST", url: this.urlPrefix + "/_session", dataType: "json",
data: {name: options.name, password: options.password},
+ beforeSend: function(xhr) {
+ xhr.setRequestHeader('Accept', 'application/json');
+ },
complete: function(req) {
var resp = $.httpData(req, "json");
if (req.status == 200) {
@@ -140,6 +146,9 @@
$.ajax({
type: "DELETE", url: this.urlPrefix + "/_session", dataType: "json",
username : "_", password : "_",
+ beforeSend: function(xhr) {
+ xhr.setRequestHeader('Accept', 'application/json');
+ },
complete: function(req) {
var resp = $.httpData(req, "json");
if (req.status == 200) {
@@ -638,6 +647,7 @@
var commit = options.ensure_full_commit;
delete options.ensure_full_commit;
return function(xhr) {
+ xhr.setRequestHeader('Accept', 'application/json');
xhr.setRequestHeader("X-Couch-Full-Commit", commit.toString());
};
}