Merge branch 'bstable'

CHANGELOG.md

@@ -21,6 +21,10 @@
 
 ### 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)]
 - 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.
 

src/Filtering/ThreadHiding.coffee

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

src/Posting/QR.cooldown.coffee

@@ -20,6 +20,8 @@ QR.cooldown =
     # Read cooldown times
     if m = Get.scriptData().match /\bcooldowns *= *({[^}]+})/
       $.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
     QR.cooldown.maxDelay = 0

src/css/style.css

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