Merge from Appchan X: src/Archive

This commit is contained in:
ccd0 2015-01-30 20:44:28 -08:00
parent 94928b7c83
commit b824b5f180
3 changed files with 3 additions and 3 deletions

View File

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

View File

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

View File

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