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

Offer cross-origin abort in userscripts if available.

Browse Source
This commit is contained in:
ccd0 2019-03-20 19:08:46 -07:00
parent e98fed9e5f
commit 6ea1d4ca13
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Monitoring/ThreadWatcher.coffee
View File

@ -177,6 +177,7 @@ ThreadWatcher =
ajax = if (siteID is Site.hostname) then $.ajax else CrossOrigin.ajax ajax = if (siteID is Site.hostname) then $.ajax else CrossOrigin.ajax
req = ajax url, req = ajax url,
onloadend: -> onloadend: ->
@finished = true
ThreadWatcher.fetched++ ThreadWatcher.fetched++
if ThreadWatcher.fetched is ThreadWatcher.requests.length if ThreadWatcher.fetched is ThreadWatcher.requests.length
ThreadWatcher.requests = [] ThreadWatcher.requests = []
@ -192,7 +193,7 @@ ThreadWatcher =
ThreadWatcher.requests.push req ThreadWatcher.requests.push req
abort: -> abort: ->
for req in ThreadWatcher.requests when req.readyState isnt 4 # DONE for req in ThreadWatcher.requests when !req.finished
req.abort?() req.abort?()
return return

3
src/platform/CrossOrigin.coffee
View File

@ -87,7 +87,7 @@ CrossOrigin =
response: null response: null
<% if (type === 'userscript') { %> <% if (type === 'userscript') { %>
(GM?.xmlHttpRequest or GM_xmlhttpRequest) gmReq = (GM?.xmlHttpRequest or GM_xmlhttpRequest)
method: "GET" method: "GET"
url: url+'' url: url+''
timeout: timeout timeout: timeout
@ -99,6 +99,7 @@ CrossOrigin =
onerror: -> onloadend.call(req) onerror: -> onloadend.call(req)
onabort: -> onloadend.call(req) onabort: -> onloadend.call(req)
ontimeout: -> onloadend.call(req) ontimeout: -> onloadend.call(req)
req.abort = gmReq.abort
<% } %> <% } %>
<% if (type === 'crx') { %> <% if (type === 'crx') { %>