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

archive settings: edit name, descriptions

Browse Source
This commit is contained in:
ccd0 2014-08-08 22:32:05 -07:00
parent 4d40b30c28
commit f6206b766f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Archive/Redirect.coffee
View File

@ -79,7 +79,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['Allow Mixed Content from Archives'] Conf['Except Archives from Encryption']
navigate: (URL, alternative) -> navigate: (URL, alternative) ->
if URL and ( if URL and (

6
src/General/Config.coffee
View File

@ -27,11 +27,11 @@ Config =
] ]
'404 Redirect': [ '404 Redirect': [
true true
'Redirect dead threads and images.' 'Redirect dead threads and images to the archives.'
] ]
'Allow Mixed Content from Archives': [ 'Except Archives from Encryption': [
false false
'Permit warningless access to HTTP-only archives from HTTPS pages.' 'Permit loading content from, and warningless redirects to, HTTP-only archives from HTTPS pages.'
] ]
'Keybinds': [ 'Keybinds': [
true true

2
src/General/Get.coffee
View File

@ -140,7 +140,7 @@ Get =
responseType: 'json' responseType: 'json'
withCredentials: url.archive.withCredentials withCredentials: url.archive.withCredentials
return true return true
else if Conf['Allow Mixed Content from Archives'] else if Conf['Except Archives from Encryption']
CrossOrigin.json url, (response) -> CrossOrigin.json url, (response) ->
Get.parseArchivedPost response, boardID, postID, root, context Get.parseArchivedPost response, boardID, postID, root, context
return true return true