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

Allow setting User-Agent via nativeAsyncRequest

Browse Source
This commit is contained in:
Anton Romanov
2015-08-19 15:40:07 -07:00
parent 82c9f5cd52
commit eaad1f28df
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/js/tomahawk.js
View File

@@ -431,7 +431,7 @@ Tomahawk.nativeAsyncRequestDone = function (reqId, xhr) {
if (Tomahawk.asyncRequestCallbacks[reqId].callback) {
Tomahawk.asyncRequestCallbacks[reqId].callback(xhr);
}
} else if (xmlHttpRequest.readyState === 4) {
} else if (xhr.readyState === 4) {
Tomahawk.log("Failed to do nativeAsyncRequest");
Tomahawk.log("Status Code was: " + xhr.status);
if (Tomahawk.asyncRequestCallbacks[reqId].errorHandler) {
@@ -500,7 +500,8 @@ Tomahawk.asyncRequest = function (url, callback, extraHeaders, options) {
*/
var shouldDoNativeRequest = function (url, callback, extraHeaders, options) {
return (extraHeaders && (extraHeaders.hasOwnProperty("Referer")
|| extraHeaders.hasOwnProperty("referer")));
|| extraHeaders.hasOwnProperty("referer")
|| extraHeaders.hasOwnProperty("User-Agent")));
};
Tomahawk.ajax = function(url, settings) {
@@ -563,8 +564,12 @@ Tomahawk.ajax = function(url, settings) {
contentType = 'application/json';
} else if (contentType === 'xml') {
contentType = 'text/xml';
} else {
} else if (xhr.hasOwnProperty('getResponseHeader')) {
contentType = xhr.getResponseHeader('Content-Type');
} else if (xhr.hasOwnProperty('contentType')) {
contentType = xhr['contentType'];
} else {
contentType = 'text/html';
}
if (~contentType.indexOf('application/json')) {