Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support repsonseType: text in CrossOrigin.ajax.

Browse Source
This commit is contained in:
ccd0 2019-07-05 16:20:30 -07:00
parent bb4acb6411
commit f96b24a792
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/platform/CrossOrigin.coffee
View File

@ -95,11 +95,12 @@ CrossOrigin =
abort: -> abort: ->
onloadend: -> onloadend: ->
# Attempts to fetch `url` in JSON format using cross-origin privileges, if available. # Attempts to fetch `url` using cross-origin privileges, if available.
# Interface is a subset of that of $.ajax. # Interface is a subset of that of $.ajax.
# Options: # Options:
# `onloadend` - called with the returned object as `this` on success or error/abort/timeout. # `onloadend` - called with the returned object as `this` on success or error/abort/timeout.
# `timeout` - time limit for request # `timeout` - time limit for request
# `responseType` - expected response type, 'json' by default; 'json' and 'text' supported
# `headers` - request headers # `headers` - request headers
# Returned object properties: # Returned object properties:
# `status` - HTTP status (0 if connection not successful) # `status` - HTTP status (0 if connection not successful)
@ -108,7 +109,8 @@ CrossOrigin =
# `abort` - function for aborting the request (silently fails on some platforms) # `abort` - function for aborting the request (silently fails on some platforms)
# `getResponseHeader` - function for reading response headers # `getResponseHeader` - function for reading response headers
ajax: (url, options={}) -> ajax: (url, options={}) ->
{onloadend, timeout, headers} = options {onloadend, timeout, responseType, headers} = options
responseType ?= 'json'
<% if (type === 'userscript') { %> <% if (type === 'userscript') { %>
unless GM?.xmlHttpRequest? or GM_xmlhttpRequest? unless GM?.xmlHttpRequest? or GM_xmlhttpRequest?
@ -126,7 +128,11 @@ CrossOrigin =
timeout timeout
onload: (xhr) -> onload: (xhr) ->
try try
response = if xhr.responseText then JSON.parse(xhr.responseText) else null response = switch responseType
when 'json'
if xhr.responseText then JSON.parse(xhr.responseText) else null
else
xhr.responseText
$.extend req, { $.extend req, {
response response
status: xhr.status status: xhr.status
@ -150,7 +156,7 @@ CrossOrigin =
<% } %> <% } %>
<% if (type === 'crx') { %> <% if (type === 'crx') { %>
eventPageRequest {type: 'ajax', url, responseType: 'json', headers, timeout}, (result) -> eventPageRequest {type: 'ajax', url, responseType, headers, timeout}, (result) ->
if result.status if result.status
$.extend req, result $.extend req, result
req.onloadend() req.onloadend()