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

Defer Except -> Exempt change until settings migration code is in place.

Browse Source
This commit is contained in:
ccd0 2015-02-06 22:36:03 -08:00
parent 3f933914ac
commit 3bddbdc5e3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Archive/Redirect.coffee
View File

@ -87,7 +87,7 @@ Redirect =
securityCheck: (URL) -> securityCheck: (URL) ->
/^https:\/\//.test(URL) or /^https:\/\//.test(URL) or
location.protocol is 'http:' or location.protocol is 'http:' or
Conf['Exempt Archives from Encryption'] Conf['Except Archives from Encryption']
navigate: (URL, alternative) -> navigate: (URL, alternative) ->
if URL and ( if URL and (

2
src/General/Config.coffee
View File

@ -30,7 +30,7 @@ Config =
true true
'Redirect dead threads and images to the archives.' 'Redirect dead threads and images to the archives.'
] ]
'Exempt Archives from Encryption': [ 'Except Archives from Encryption': [
false false
'Permit loading content from, and warningless redirects to, HTTP-only archives from HTTPS pages.' 'Permit loading content from, and warningless redirects to, HTTP-only archives from HTTPS pages.'
] ]

2
src/General/lib/fetcher.class
View File

@ -86,7 +86,7 @@ class Fetcher
responseType: 'json' responseType: 'json'
withCredentials: url.archive.withCredentials withCredentials: url.archive.withCredentials
return true return true
else if Conf['Exempt Archives from Encryption'] else if Conf['Except Archives from Encryption']
CrossOrigin.json url, (response) => CrossOrigin.json url, (response) =>
{media} = response {media} = response
if media then for key of media when /_link$/.test key if media then for key of media when /_link$/.test key