Skip to content

Closes #109 - Set content type to "application/json" for compatability with the elasticsearch-transport-wares #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Closes #109 - Set content type to "application/json" for compatability with the elasticsearch-transport-wares #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion dist/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,10 +1241,20 @@
return $.ajax( $.extend({
url: this.base_uri + params.path,
dataType: "json",
contentType: "application/json",
error: function(xhr, type, message) {
//we had an error, it could be that we're talking to an old version of elasticsearch that doesn't support cross origin requests with a contentType set, so try again without it.
if("console" in window) {
console.log({ "XHR Error": type, "message": message });
console.log({ "XHR Error": type, "message": message, "retrying": true });
}
var repeatRequestParams = this;
delete repeatRequestParams['contentType'];
repeatRequestParams['error'] = function(xhr, type, message) {
if("console" in window) {
console.log({ "XHR Error": type, "message": message, "retrying": false });
}
}
$.ajax(repeatRequestParams);
}
}, params) );
},
Expand Down
12 changes: 11 additions & 1 deletion src/app/services/cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,20 @@
return $.ajax( $.extend({
url: this.base_uri + params.path,
dataType: "json",
contentType: "application/json",
error: function(xhr, type, message) {
//we had an error, it could be that we're talking to an old version of elasticsearch that doesn't support cross origin requests with a contentType set, so try again without it.
if("console" in window) {
console.log({ "XHR Error": type, "message": message });
console.log({ "XHR Error": type, "message": message, "retrying": true });
}
var repeatRequestParams = this;
delete repeatRequestParams['contentType'];
repeatRequestParams['error'] = function(xhr, type, message) {
if("console" in window) {
console.log({ "XHR Error": type, "message": message, "retrying": false });
}
}
$.ajax(repeatRequestParams);
}
}, params) );
},
Expand Down