From 9d5ef234e99fdb72075b583c13ec77c595161921 Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Thu, 15 Aug 2013 20:05:46 -0700
Subject: [PATCH] Fix ToggleBarVisibility keybind

---
 builds/4chan-X.user.js            | 16 +++++-----------
 builds/crx/script.js              | 16 +++++-----------
 src/General/Header.coffee         | 16 +++++++++-------
 src/Miscellaneous/Keybinds.coffee |  4 +---
 4 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index fab6625b9..3b8e398bb 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1730,17 +1730,14 @@
       (hide ? $.addClass : $.rmClass)(Header.bar, 'autohide');
       return (hide ? $.addClass : $.rmClass)(doc, 'autohide');
     },
-    toggleBarVisibility: function(e) {
+    toggleBarVisibility: function() {
       var hide, message;
 
-      if (e.type === 'mousedown' && e.button !== 0) {
-        return;
-      }
       hide = this.nodeName === 'INPUT' ? this.checked : !$.hasClass(Header.bar, 'autohide');
-      Conf['Header auto-hide'] = hide;
-      $.set('Header auto-hide', hide);
+      this.checked = hide;
+      $.set('Header auto-hide', Conf['Header auto-hide'] = hide);
       Header.setBarVisibility(hide);
-      message = hide ? 'The header bar will automatically hide itself.' : 'The header bar will remain visible.';
+      message = "The header bar will " + (hide ? 'automatically hide itself.' : 'remain visible.');
       return new Notification('info', message, 2);
     },
     setFooterVisibility: function(hide) {
@@ -9452,10 +9449,7 @@
           }
           break;
         case Conf['Toggle header']:
-          if (!$('#menu.left')) {
-            Header.menuButton.click();
-          }
-          Header.headerToggler.click();
+          Header.toggleBarVisibility();
           break;
         case Conf['Open empty QR']:
           Keybinds.qr(threadRoot);
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 3c3e1da35..8bbed79a4 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1746,17 +1746,14 @@
       (hide ? $.addClass : $.rmClass)(Header.bar, 'autohide');
       return (hide ? $.addClass : $.rmClass)(doc, 'autohide');
     },
-    toggleBarVisibility: function(e) {
+    toggleBarVisibility: function() {
       var hide, message;
 
-      if (e.type === 'mousedown' && e.button !== 0) {
-        return;
-      }
       hide = this.nodeName === 'INPUT' ? this.checked : !$.hasClass(Header.bar, 'autohide');
-      Conf['Header auto-hide'] = hide;
-      $.set('Header auto-hide', hide);
+      this.checked = hide;
+      $.set('Header auto-hide', Conf['Header auto-hide'] = hide);
       Header.setBarVisibility(hide);
-      message = hide ? 'The header bar will automatically hide itself.' : 'The header bar will remain visible.';
+      message = "The header bar will " + (hide ? 'automatically hide itself.' : 'remain visible.');
       return new Notification('info', message, 2);
     },
     setFooterVisibility: function(hide) {
@@ -9442,10 +9439,7 @@
           }
           break;
         case Conf['Toggle header']:
-          if (!$('#menu.left')) {
-            Header.menuButton.click();
-          }
-          Header.headerToggler.click();
+          Header.toggleBarVisibility();
           break;
         case Conf['Open empty QR']:
           Keybinds.qr(threadRoot);
diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index c7089e329..4f8684393 100755
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -244,19 +244,21 @@ Header =
     (if hide then $.addClass else $.rmClass) Header.bar, 'autohide'
     (if hide then $.addClass else $.rmClass) doc, 'autohide'
 
-  toggleBarVisibility: (e) ->
-    return if e.type is 'mousedown' and e.button isnt 0 # not LMB
+  toggleBarVisibility: ->
     hide = if @nodeName is 'INPUT'
       @checked
     else
       !$.hasClass Header.bar, 'autohide'
-    Conf['Header auto-hide'] = hide
-    $.set 'Header auto-hide', hide
+    # set checked status if called from keybind
+    @checked = hide
+
+    $.set 'Header auto-hide', Conf['Header auto-hide'] = hide
     Header.setBarVisibility hide
-    message = if hide
-      'The header bar will automatically hide itself.'
+    message = "The header bar will #{if hide
+      'automatically hide itself.'
     else
-      'The header bar will remain visible.'
+      'remain visible.'}"
+
     new Notification 'info', message, 2
 
   setFooterVisibility: (hide) ->
diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee
index 336f711a1..e52c46e0b 100755
--- a/src/Miscellaneous/Keybinds.coffee
+++ b/src/Miscellaneous/Keybinds.coffee
@@ -25,9 +25,7 @@ Keybinds =
         if Conf['Custom Board Navigation']
           Header.toggleBoardList()
       when Conf['Toggle header']
-        unless $('#menu.left')
-          Header.menuButton.click()
-        Header.headerToggler.click()
+        Header.toggleBarVisibility()
       when Conf['Open empty QR']
         Keybinds.qr threadRoot
       when Conf['Open QR']