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-01 05:26:29 -07:00
commit 260bbe74af
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -21,6 +21,10 @@
### v1.12.3 ### v1.12.3
**v1.12.3.5** *(2016-10-01)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.5/builds/4chan-X-noupdate.crx)]
- Fix cooldowns.
- Fix party hat alignment when Thread Hiding Buttons are enabled.
**v1.12.3.4** *(2016-09-28)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.4/builds/4chan-X-noupdate.crx)] **v1.12.3.4** *(2016-09-28)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.12.3.4/builds/4chan-X-noupdate.crx)]
- Let board banners show. You may need to add the an exception to your ad blocker's cosmetic filters: `boards.4chan.org#@#.middlead` If you do want to hide them, you can add `.middlead {display: none;}` to custom CSS. - Let board banners show. You may need to add the an exception to your ad blocker's cosmetic filters: `boards.4chan.org#@#.middlead` If you do want to hide them, you can add `.middlead {display: none;}` to custom CSS.

2
src/Filtering/ThreadHiding.coffee
View File

@ -5,6 +5,8 @@ ThreadHiding =
return @catalogWatch() if g.VIEW is 'catalog' return @catalogWatch() if g.VIEW is 'catalog'
@catalogSet g.BOARD @catalogSet g.BOARD
$.on d, 'IndexRefreshInternal', @onIndexRefresh $.on d, 'IndexRefreshInternal', @onIndexRefresh
if Conf['Thread Hiding Buttons']
$.addClass doc, 'thread-hide'
Callbacks.Post.push Callbacks.Post.push
name: 'Thread Hiding' name: 'Thread Hiding'
cb: @node cb: @node

2
src/Posting/QR.cooldown.coffee
View File

@ -20,6 +20,8 @@ QR.cooldown =
# Read cooldown times # Read cooldown times
if m = Get.scriptData().match /\bcooldowns *= *({[^}]+})/ if m = Get.scriptData().match /\bcooldowns *= *({[^}]+})/
$.extend QR.cooldown.delays, JSON.parse m[1] $.extend QR.cooldown.delays, JSON.parse m[1]
QR.cooldown.delays.reply_intra or= QR.cooldown.delays.reply
QR.cooldown.delays.image_intra or= QR.cooldown.delays.image
# The longest reply cooldown, for use in pruning old reply data # The longest reply cooldown, for use in pruning old reply data
QR.cooldown.maxDelay = 0 QR.cooldown.maxDelay = 0

4
src/css/style.css
View File

@ -1367,6 +1367,7 @@ input[name="Default Volume"] {
} }
.hide-thread-button { .hide-thread-button {
margin-top: -1px; margin-top: -1px;
width: 11px;
} }
.stub ~ * { .stub ~ * {
display: none !important; display: none !important;
@ -1380,6 +1381,9 @@ input[name="Default Volume"] {
:root.reply-hide div.sideArrows { :root.reply-hide div.sideArrows {
display: none; display: none;
} }
:root.thread-hide .party-hat {
left: 19px;
}
/* QR */ /* QR */
:root.hide-original-post-form #togglePostFormLink, :root.hide-original-post-form #togglePostFormLink,