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

Handle errors thrown by GM.xmlHttpRequest.

Browse Source
This commit is contained in:
ccd0 2019-04-24 03:12:48 -07:00
parent 69a56f9e05
commit c3054640a8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/platform/CrossOrigin.coffee
View File

@ -19,7 +19,7 @@ CrossOrigin =
cb response, responseHeaderString cb response, responseHeaderString
<% } %> <% } %>
<% if (type === 'userscript') { %> <% if (type === 'userscript') { %>
(GM?.xmlHttpRequest or GM_xmlhttpRequest) gmOptions =
method: "GET" method: "GET"
url: url url: url
headers: headers headers: headers
@ -40,6 +40,10 @@ CrossOrigin =
cb null cb null
onabort: -> onabort: ->
cb null cb null
try
(GM?.xmlHttpRequest or GM_xmlhttpRequest) gmOptions
catch
$.queueTask cb, null
<% } %> <% } %>
file: (url, cb) -> file: (url, cb) ->
@ -102,7 +106,7 @@ CrossOrigin =
req.onloadend = onloadend req.onloadend = onloadend
<% if (type === 'userscript') { %> <% if (type === 'userscript') { %>
gmReq = (GM?.xmlHttpRequest or GM_xmlhttpRequest) { gmOptions = {
method: 'GET' method: 'GET'
url url
headers headers
@ -121,6 +125,11 @@ CrossOrigin =
onabort: -> req.onloadend() onabort: -> req.onloadend()
ontimeout: -> req.onloadend() ontimeout: -> req.onloadend()
} }
try
gmReq = (GM?.xmlHttpRequest or GM_xmlhttpRequest) gmOptions
catch
return $.ajax url, options
if gmReq and typeof gmReq.abort is 'function' if gmReq and typeof gmReq.abort is 'function'
req.abort = -> req.abort = ->
try try