From 9d5c7c1ef7c13984e1a11a043181a8d089079f43 Mon Sep 17 00:00:00 2001
From: dzamie <dzami3@gmail.com>
Date: Wed, 29 Jun 2016 22:37:14 -0400
Subject: [PATCH] Thread watcher always toggleable, add setting for initial
 visibility

Changes previous "Toggleable Thread Watcher" and "Watcher Defaults to
Visible" to always toggleable and "Persistent Thread Watcher". Updated
keybind description to match.
---
 src/Miscellaneous/Keybinds.coffee   |  2 +-
 src/Monitoring/ThreadWatcher.coffee | 10 +++++-----
 src/config/Config.coffee            | 11 +++--------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee
index 521092091..f0d9d7158 100644
--- a/src/Miscellaneous/Keybinds.coffee
+++ b/src/Miscellaneous/Keybinds.coffee
@@ -98,7 +98,7 @@ Keybinds =
         return unless ThreadWatcher.enabled
         ThreadWatcher.buttonFetchAll()
       when Conf['Toggle thread watcher']
-        return unless ThreadWatcher.enabled and Conf['Toggleable Thread Watcher']
+        return unless ThreadWatcher.enabled
         ThreadWatcher.toggleWatcher()
       # Images
       when Conf['Expand image']
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index cadb68615..946a59a95 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -34,11 +34,11 @@ ThreadWatcher =
 
     if Conf['Fixed Thread Watcher']
       $.addClass doc, 'fixed-watcher'
-    if Conf['Toggleable Thread Watcher']
-      if !Conf['Watcher Defaults to Visible']
-        @dialog.hidden = true
-      Header.addShortcut 'watcher', sc, 510
-      $.addClass doc, 'toggleable-watcher'
+    if !Conf['Persistent Thread Watcher']
+      @dialog.hidden = true
+    
+    Header.addShortcut 'watcher', sc, 510
+    $.addClass doc, 'toggleable-watcher'
 
     ThreadWatcher.fetchAuto()
 
diff --git a/src/config/Config.coffee b/src/config/Config.coffee
index 6b314997d..97169ff6a 100644
--- a/src/config/Config.coffee
+++ b/src/config/Config.coffee
@@ -384,16 +384,11 @@ Config =
         'Makes the thread watcher scroll with the page.'
         1
       ]
-      'Toggleable Thread Watcher': [
+      'Persistent Thread Watcher': [
         true
-        'Adds a shortcut for the thread watcher and hides the watcher by default.'
+        'The thread watcher will be visible when the page is loaded.'
         1
       ]
-      'Watcher Defaults to Visible': [
-        false
-        'Displays the thread watcher by default, rather than hiding it.'
-        2
-      ]
       'Mark New IPs': [
         false
         'Label each post from a new IP with the thread\'s current IP count.'
@@ -864,7 +859,7 @@ Config =
     ]
     'Toggle thread watcher': [
       't'
-      'Toggle visibility of thread watcher when toggle is enabled'
+      'Toggle visibility of thread watcher.'
     ]
     # Images
     'Expand image': [