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

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2017-05-13 15:09:20 -07:00
commit c30adf4798
7 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -19,6 +19,10 @@
### v1.13.8
**v1.13.8.7** *(2017-05-13)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.8.7/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.8.7/builds/4chan-X-noupdate.crx)]
- Fix MathJax on /sci/. #1356
- Minor fixes for new board /bant/.
**v1.13.8.6** *(2017-04-26)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.8.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.8.6/builds/4chan-X-noupdate.crx)]
- Workaround for issues with cooldown timer and other things starting in Firefox 53. #1323
- Fix captcha cleanup. #1341

12
src/Archive/archives.json
View File

@ -15,8 +15,8 @@
"http": false,
"https": true,
"software": "foolfuuka",
"boards": ["c", "e", "n", "news", "out", "p", "toy", "vip", "vp", "w", "wg", "wsr"],
"files": ["c", "e", "n", "news", "out", "p", "toy", "vip", "vp", "w", "wg", "wsr"],
"boards": ["bant", "c", "e", "n", "news", "out", "p", "toy", "vip", "vp", "w", "wg", "wsr"],
"files": ["bant", "c", "e", "n", "news", "out", "p", "toy", "vip", "vp", "w", "wg", "wsr"],
"reports": true
}, {
"uid": 8,
@ -81,9 +81,9 @@
"http": true,
"https": true,
"software": "foolfuuka",
"boards": ["3", "a", "aco", "adv", "an", "asp", "b", "biz", "c", "can", "cgl", "ck", "cm", "co", "cock", "d", "diy", "e", "f", "fa", "fap", "fit", "fitlit", "g", "gd", "gif", "h", "hc", "his", "hm", "hr", "i", "ic", "int", "jp", "k", "lgbt", "lit", "m", "mlp", "mlpol", "mo", "mtv", "mu", "n", "news", "o", "out", "outsoc", "p", "po", "pol", "qa", "qst", "r", "r9k", "s", "s4s", "sci", "soc", "sp", "spa", "t", "tg", "toy", "trash", "trv", "tv", "u", "v", "vg", "vint", "vip", "vp", "vr", "w", "wg", "wsg", "wsr", "x", "y"],
"boards": ["3", "a", "aco", "adv", "an", "asp", "b", "bant", "biz", "c", "can", "cgl", "ck", "cm", "co", "cock", "d", "diy", "e", "f", "fa", "fap", "fit", "fitlit", "g", "gd", "gif", "h", "hc", "his", "hm", "hr", "i", "ic", "int", "jp", "k", "lgbt", "lit", "m", "mlp", "mlpol", "mo", "mtv", "mu", "n", "news", "o", "out", "outsoc", "p", "po", "pol", "qa", "qst", "r", "r9k", "s", "s4s", "sci", "soc", "sp", "spa", "t", "tg", "toy", "trash", "trv", "tv", "u", "v", "vg", "vint", "vip", "vp", "vr", "w", "wg", "wsg", "wsr", "x", "y"],
"files": ["can", "cock", "fap", "fitlit", "gd", "mlpol", "mo", "mtv", "outsoc", "po", "qst", "spa", "vint", "vip"],
"search": ["aco", "adv", "an", "asp", "b", "c", "can", "cgl", "ck", "cm", "cock", "con", "d", "diy", "e", "f", "fap", "fitlit", "gd", "gif", "h", "hc", "his", "hm", "hr", "i", "ic", "lgbt", "lit", "mlpol", "mo", "mtv", "n", "news", "o", "out", "outsoc", "p", "po", "q", "qa", "qst", "r", "s", "soc", "spa", "trv", "u", "vint", "vip", "w", "wg", "wsg", "wsr", "x", "y"],
"search": ["aco", "adv", "an", "asp", "b", "bant", "c", "can", "cgl", "ck", "cm", "cock", "con", "d", "diy", "e", "f", "fap", "fitlit", "gd", "gif", "h", "hc", "his", "hm", "hr", "i", "ic", "lgbt", "lit", "mlpol", "mo", "mtv", "n", "news", "o", "out", "outsoc", "p", "po", "q", "qa", "qst", "r", "s", "soc", "spa", "trv", "u", "vint", "vip", "w", "wg", "wsg", "wsr", "x", "y"],
"reports": true
}, {
"uid": 30,
@ -92,8 +92,8 @@
"http": true,
"https": true,
"software": "foolfuuka",
"boards": ["b"],
"files": ["b"],
"boards": ["b", "bant"],
"files": ["b", "bant"],
"reports": true
}, {
"uid": 31,

2
src/General/Header.coffee
View File

@ -270,7 +270,7 @@ Header =
return a.firstChild # Its text node.
if /-expired/.test t
if boardID not in ['b', 'f', 'trash']
if boardID not in ['b', 'f', 'trash', 'bant']
a.href = "/#{boardID}/archive"
else
return a.firstChild # Its text node.

2
src/General/Index.coffee
View File

@ -84,7 +84,7 @@ Index =
@navLinks = $.el 'div', className: 'navLinks json-index'
$.extend @navLinks, <%= readHTML('NavLinks.html') %>
$('.cataloglink a', @navLinks).href = CatalogLinks.catalog()
$('.archlistlink', @navLinks).hidden = true if g.BOARD.ID in ['b', 'trash']
$('.archlistlink', @navLinks).hidden = true if g.BOARD.ID in ['b', 'trash', 'bant']
$.on $('#index-last-refresh a', @navLinks), 'click', @cb.refreshFront
# Search field

5
src/General/Settings.coffee
View File

@ -418,6 +418,11 @@ Settings =
setD 'Require OP Quote Link', true
if compareString < '00001.00013.00008.00000'
setD 'Download Link', true
if compareString < '00001.00013.00008.00007'
if data['jsWhitelist']?
list = data['jsWhitelist'].split('\n')
if 'https://cdnjs.cloudflare.com' not in list and 'https://cdn.mathjax.org' in list
set 'jsWhitelist', data['jsWhitelist'] + '\n\nhttps://cdnjs.cloudflare.com'
changes
loadSettings: (data, cb) ->

2
src/Miscellaneous/ExpandThread.coffee
View File

@ -61,7 +61,7 @@ ExpandThread =
1
else switch g.BOARD.ID
# XXX boards config
when 'b', 'vg' then 3
when 'b', 'vg', 'bant' then 3
when 't' then 1
else 5
replies = replies[...-num]

1
src/config/Config.coffee
View File

@ -831,6 +831,7 @@ Config =
https://www.gstatic.com
http://cdn.mathjax.org
https://cdn.mathjax.org
https://cdnjs.cloudflare.com
'self'
'unsafe-inline'
'unsafe-eval'