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 2016-06-07 10:54:20 -07:00
commit 189c106e93
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -12,6 +12,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.34 ### v1.11.34
**v1.11.34.10** *(2016-06-07)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.10/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.10/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix blocking of CloudFlare scripts.
**v1.11.34.9** *(2016-06-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.9/builds/4chan-X-noupdate.crx "Chromium version")] **v1.11.34.9** *(2016-06-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.9/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.9/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix loading icon getting stuck on in Firefox. - Fix loading icon getting stuck on in Firefox.

1
src/config/Config.coffee
View File

@ -799,6 +799,7 @@ Config =
http://www.google.com http://www.google.com
https://www.google.com https://www.google.com
https://www.gstatic.com https://www.gstatic.com
'self'
'unsafe-inline' 'unsafe-inline'
'unsafe-eval' 'unsafe-eval'
''' '''

1
src/main/Main.coffee
View File

@ -54,6 +54,7 @@ Main =
if $.platform is 'crx' then $.global -> if $.platform is 'crx' then $.global ->
{whitelist} = document.currentScript.dataset {whitelist} = document.currentScript.dataset
whitelist = whitelist.split('\n').filter (x) -> x[0] isnt "'" whitelist = whitelist.split('\n').filter (x) -> x[0] isnt "'"
whitelist.push "#{location.protocol}//#{location.host}"
oldFun = {} oldFun = {}
for key in ['createElement', 'write'] for key in ['createElement', 'write']
oldFun[key] = document[key] oldFun[key] = document[key]