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-10-27 10:36:06 -07:00
commit 4118dd51df
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -77,6 +77,9 @@
### v1.12.3 ### v1.12.3
**v1.12.3.10** *(2016-10-27)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.10/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.10/builds/4chan-X-noupdate.crx)]
- Update due to 4chan's ad changes.
**v1.12.3.9** *(2016-10-18)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.9/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.9/builds/4chan-X-noupdate.crx)] **v1.12.3.9** *(2016-10-18)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.9/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.9/builds/4chan-X-noupdate.crx)]
- Add basic support for is.4chan.org domain. - Add basic support for is.4chan.org domain.

2
src/General/Settings.coffee
View File

@ -113,7 +113,7 @@ Settings =
Enable it on boards.4chan.org in your browser's privacy settings (may be listed as part of "local data" or "cookies"). Enable it on boards.4chan.org in your browser's privacy settings (may be listed as part of "local data" or "cookies").
""" """
ads: (cb) -> ads: (cb) ->
$.onExists doc, '.ad-cnt', (ad) -> $.onExists ad, 'img', -> $.onExists doc, '.ad-cnt, .adg-rects', (ad) -> $.onExists ad, 'img, iframe', ->
url = Redirect.to 'thread', {boardID: 'qa', threadID: 362590} url = Redirect.to 'thread', {boardID: 'qa', threadID: 362590}
cb $.el 'li', cb $.el 'li',
<%= html( <%= html(

3
src/css/style.css
View File

@ -129,12 +129,13 @@ body > div[style*=" top: -10000px;"] {
:root:not(.ads-loaded) .ad-cnt > * { :root:not(.ads-loaded) .ad-cnt > * {
height: auto; height: auto;
} }
:root:not(.ads-loaded) .adg-rects,
:root:not(.ads-loaded) .ad-plea, :root:not(.ads-loaded) .ad-plea,
:root:not(.ads-loaded) hr.abovePostForm, :root:not(.ads-loaded) hr.abovePostForm,
:root:not(.ads-loaded) .ad-plea-bottom + hr { :root:not(.ads-loaded) .ad-plea-bottom + hr {
display: none; display: none;
} }
hr + div.center:not(.ad-cnt):not(.topad):not(.middlead):not(.bottomad) { div.center[style] {
display: none !important; display: none !important;
} }

2
src/main/Main.coffee
View File

@ -187,7 +187,7 @@ Main =
$.addClass doc, 'fourchan-x', 'seaweedchan' $.addClass doc, 'fourchan-x', 'seaweedchan'
$.addClass doc, if g.VIEW is 'thread' then 'thread-view' else g.VIEW $.addClass doc, if g.VIEW is 'thread' then 'thread-view' else g.VIEW
$.addClass doc, "ua-#{$.engine}" if $.engine $.addClass doc, "ua-#{$.engine}" if $.engine
$.onExists doc, '.ad-cnt', (ad) -> $.onExists ad, 'img', -> $.addClass doc, 'ads-loaded' $.onExists doc, '.ad-cnt, .adg-rects', (ad) -> $.onExists ad, 'img, iframe', -> $.addClass doc, 'ads-loaded'
$.addClass doc, 'autohiding-scrollbar' if Conf['Autohiding Scrollbar'] $.addClass doc, 'autohiding-scrollbar' if Conf['Autohiding Scrollbar']
$.ready -> $.ready ->
if d.body.clientHeight > doc.clientHeight and (window.innerWidth is doc.clientWidth) isnt Conf['Autohiding Scrollbar'] if d.body.clientHeight > doc.clientHeight and (window.innerWidth is doc.clientWidth) isnt Conf['Autohiding Scrollbar']