From a94d76d84b3138a142006133c6144ef8d2ec16d4 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Fri, 8 Mar 2019 20:45:37 -0800 Subject: [PATCH] Let the default responseType in $.ajax always be "json" regardless of URL. --- src/Miscellaneous/Report.coffee | 1 - src/platform/$.coffee | 2 +- src/platform/CrossOrigin.coffee | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Miscellaneous/Report.coffee b/src/Miscellaneous/Report.coffee index 9ae50029e..aad20ea1b 100644 --- a/src/Miscellaneous/Report.coffee +++ b/src/Miscellaneous/Report.coffee @@ -77,7 +77,6 @@ Report = for [name, url] in urls do (name, url) -> $.ajax url, - responseType: 'json' onloadend: -> results.push [name, @response or {error: ''}] if results.length is urls.length diff --git a/src/platform/$.coffee b/src/platform/$.coffee index 78697a9db..abb6f28bc 100644 --- a/src/platform/$.coffee +++ b/src/platform/$.coffee @@ -52,7 +52,7 @@ $.ajax = do -> (url, options={}, extra={}) -> {type, whenModified, bypassCache, upCallbacks, form} = extra - options.responseType ?= 'json' if /\.json$/.test url + options.responseType ?= 'json' # XXX https://forums.lanik.us/viewtopic.php?f=64&t=24173&p=78310 url = url.replace /^((?:https?:)?\/\/(?:\w+\.)?4c(?:ha|d)n\.org)\/adv\//, '$1//adv/' if whenModified diff --git a/src/platform/CrossOrigin.coffee b/src/platform/CrossOrigin.coffee index 179a90cde..cb9bc899a 100644 --- a/src/platform/CrossOrigin.coffee +++ b/src/platform/CrossOrigin.coffee @@ -90,7 +90,7 @@ CrossOrigin = unless GM?.xmlHttpRequest? or GM_xmlhttpRequest? if bypassCache $.cleanCache (url2) -> url2 is url - if (req = $.cache url, cb, responseType: 'json') + if (req = $.cache url, cb) $.on req, 'abort error', -> cb.call({}) else cb.call {}