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

Better handling of blocked URL exception.

Browse Source
This commit is contained in:
ccd0 2016-01-28 00:49:30 -08:00
parent f768ff75cc
commit 2e16923336
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/General/$.coffee
View File

@ -42,6 +42,7 @@ $.ajax = do ->
# With the `If-Modified-Since` header we only receive the HTTP headers and no body for 304 responses. # With the `If-Modified-Since` header we only receive the HTTP headers and no body for 304 responses.
# This saves a lot of bandwidth and CPU time for both the users and the servers. # This saves a lot of bandwidth and CPU time for both the users and the servers.
lastModified = {} lastModified = {}
blockedURLs = {} blockedURLs = {}
blockedError = (url) -> blockedError = (url) ->
return if blockedURLs[url] return if blockedURLs[url]
@ -52,7 +53,8 @@ $.ajax = do ->
'[<a href="' + meta.faq + '#why-was-' + name.toLowerCase() + '-blocked-from-loading-a-url" target="_blank">More info</a>]' '[<a href="' + meta.faq + '#why-was-' + name.toLowerCase() + '-blocked-from-loading-a-url" target="_blank">More info</a>]'
) %> ) %>
$('span', message).textContent = (if /^\/\//.test url then location.protocol else '') + url $('span', message).textContent = (if /^\/\//.test url then location.protocol else '') + url
new Notice 'error', message, 30, -> delete blockedURLs[url] new Notice 'warning', message, 30, -> delete blockedURLs[url]
(url, options={}, extra={}) -> (url, options={}, extra={}) ->
{type, whenModified, upCallbacks, form} = extra {type, whenModified, upCallbacks, form} = extra
# XXX https://forums.lanik.us/viewtopic.php?f=64&t=24173&p=78310 # XXX https://forums.lanik.us/viewtopic.php?f=64&t=24173&p=78310
@ -62,8 +64,11 @@ $.ajax = do ->
try try
r.open type, url, true r.open type, url, true
catch err catch err
# XXX Some content blockers in Firefox (e.g. Adblock Plus) throw an exception here instead of dispatching an error event.
blockedError url blockedError url
options.onerror?() for event in ['error', 'loadend']
r["on#{event}"] = options["on#{event}"]
$.queueTask $.event, event, null, r
return return
if whenModified if whenModified
r.setRequestHeader 'If-Modified-Since', lastModified[whenModified][url] if lastModified[whenModified]?[url]? r.setRequestHeader 'If-Modified-Since', lastModified[whenModified][url] if lastModified[whenModified]?[url]?