github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 09:17:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

add case insensitive test on ajax request type

Browse Source
This commit is contained in:
Régis Hanol 2014-02-12 20:05:41 -08:00
parent 185f4bd8c8
commit a86002f582
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/mixins/ajax.js
View File

@ -72,14 +72,14 @@ Discourse.Ajax = Em.Mixin.create({
// We default to JSON on GET. If we don't, sometimes if the server doesn't return the proper header
// it will not be parsed as an object.
if (!args.type) args.type = 'GET';
if ((!args.dataType) && (args.type === 'GET')) args.dataType = 'json';
if (!args.dataType && args.type.toUpperCase() === 'GET') args.dataType = 'json';
$.ajax(Discourse.getURL(url), args);
};
// For cached pages we strip out CSRF tokens, need to round trip to server prior to sending the
// request (bypass for GET, not needed)
if(args.type && args.type !== 'GET' && !Discourse.Session.currentProp('csrfToken')){
if(args.type && args.type.toUpperCase() !== 'GET' && !Discourse.Session.currentProp('csrfToken')){
return Ember.Deferred.promise(function(promise){
$.ajax(Discourse.getURL('/session/csrf'))
.success(function(result){
@ -93,8 +93,3 @@ Discourse.Ajax = Em.Mixin.create({
}
});