From afb1f0a57249398a2f840d6dad2a96c17b1e981a Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 31 Jan 2015 23:23:37 -0800
Subject: [PATCH] Make 'Image Hover in Catalog' a suboption of 'Image Hover'.

---
 src/General/Config.coffee    |  2 ++
 src/Images/ImageHover.coffee | 11 ++++++-----
 src/Images/Volume.coffee     |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 703903855..dcc1068c8 100755
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -182,10 +182,12 @@ Config =
       'Image Hover in Catalog': [
         false
         'Show full image / video on mouseover in <%= meta.name %> catalog.'
+        1
       ]
       'Mouse Wheel Volume': [
         true
         'Adjust volume of hovering videos with mouse wheel.'
+        1
       ]
       'Gallery': [
         true
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index a9a0f4406..b26db6d48 100755
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -1,10 +1,11 @@
 ImageHover =
   init: ->
-    return if g.VIEW not in ['index', 'thread']
-    if Conf['Image Hover']
-      Post.callbacks.push
-        name: 'Image Hover'
-        cb:   @node
+    return unless Conf['Image Hover'] and g.VIEW in ['index', 'thread']
+
+    Post.callbacks.push
+      name: 'Image Hover'
+      cb:   @node
+
     if Conf['Image Hover in Catalog']
       CatalogThread.callbacks.push
         name: 'Image Hover'
diff --git a/src/Images/Volume.coffee b/src/Images/Volume.coffee
index 9eef9afb7..e818dc5f4 100644
--- a/src/Images/Volume.coffee
+++ b/src/Images/Volume.coffee
@@ -2,7 +2,7 @@ Volume =
   init: ->
     return unless g.BOARD.ID in ['gif', 'wsg'] and
       g.VIEW in ['index', 'thread'] and
-      (Conf['Image Expansion'] or Conf['Image Hover'] or Conf['Image Hover in Catalog'] or Conf['Gallery'])
+      (Conf['Image Expansion'] or Conf['Image Hover'] or Conf['Gallery'])
 
     unmuteEntry = UI.checkbox 'Allow Sound', ' Allow Sound'
     unmuteEntry.title = Config.main['Images and Videos']['Allow Sound'][1]