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-05-19 15:46:20 -07:00
commit 12c96cd77e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -33,6 +33,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.33 ### v1.11.33
**v1.11.33.5** *(2016-05-19)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.33.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.33.5/builds/4chan-X-noupdate.crx "Chromium version")]
- Update ad server blacklist.
**v1.11.33.4** *(2016-05-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.33.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.33.4/builds/4chan-X-noupdate.crx "Chromium version")] **v1.11.33.4** *(2016-05-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.33.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.33.4/builds/4chan-X-noupdate.crx "Chromium version")]
- Archive list: waruso.org is back; also temporarily add fgts.jp (still down) as last option in list. - Archive list: waruso.org is back; also temporarily add fgts.jp (still down) as last option in list.

4
src/main/Main.coffee
View File

@ -21,12 +21,12 @@ Main =
configurable: false configurable: false
get: -> throw new Error() get: -> throw new Error()
set: -> throw new Error() set: -> throw new Error()
for prop in ['atOptions', 'adsterra_key', 'EpmadsConfig', 'epmads_key', 'EpomConfig', 'epom_key', 'exoDocumentProtocol'] for prop in ['atOptions', 'adsterra_key', 'EpmadsConfig', 'epmads_key', 'EpomConfig', 'epom_key', 'exoDocumentProtocol', 'supp_key']
nuke window, prop nuke window, prop
return return
$.on window, 'beforescriptexecute', (e) -> $.on window, 'beforescriptexecute', (e) ->
host = e.target.src.split('/')[2]?.match(/[^.]+\.[^.]+$/)?[0] host = e.target.src.split('/')[2]?.match(/[^.]+\.[^.]+$/)?[0]
e.preventDefault() if host in ['bnhtml.com', 'ecpmrocks.com', 'advertisation.com', 'exoclick.com'] e.preventDefault() if host in ['bnhtml.com', 'ecpmrocks.com', 'advertisation.com', 'exoclick.com', 'n298adserv.com']
# Detect multiple copies of 4chan X # Detect multiple copies of 4chan X
$.on d, '4chanXInitFinished', -> $.on d, '4chanXInitFinished', ->