mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 05:37:29 +02:00
Code Issues Releases Wiki Activity

dataEncodingFormat => dataFormat

Browse Source
This commit is contained in:
Anton Romanov
2015-05-02 09:46:04 -07:00
parent 4c1da6f78b
commit f2acf783cc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/js/tomahawk.js
View File

@@ -494,7 +494,7 @@ Tomahawk.ajax = function(url, settings) {
settings.type = settings.type || settings.method || 'get'; settings.type = settings.type || settings.method || 'get';
settings.method = settings.type; settings.method = settings.type;
settings.dataEncodingFormat = settings.dataEncodingFormat || 'form'; settings.dataFormat = settings.dataFormat || 'form';
if (settings.data) { if (settings.data) {
var formEncode = function(obj) { var formEncode = function(obj) {
@@ -510,14 +510,14 @@ Tomahawk.ajax = function(url, settings) {
return str.join("&"); return str.join("&");
}; };
if (typeof settings.data === 'object') { if (typeof settings.data === 'object') {
if (settings.dataEncodingFormat == 'form') { if (settings.dataFormat == 'form') {
settings.data = formEncode(settings.data); settings.data = formEncode(settings.data);
settings.contentType = settings.contentType || 'application/x-www-form-urlencoded'; settings.contentType = settings.contentType || 'application/x-www-form-urlencoded';
} else if (settings.dataEncodingFormat == 'json') { } else if (settings.dataFormat == 'json') {
settings.data = JSON.stringify(settings.data); settings.data = JSON.stringify(settings.data);
settings.contentType = settings.contentType || 'application/json'; settings.contentType = settings.contentType || 'application/json';
} else { } else {
throw new Error("Tomahawk.ajax: unknown dataEncodingFormat requested: " + settings.dataEncodingFormat); throw new Error("Tomahawk.ajax: unknown dataFormat requested: " + settings.dataFormat);
} }
} else { } else {
throw new Error("Tomahawk.ajax: data should be either object or string"); throw new Error("Tomahawk.ajax: data should be either object or string");