Revert "Make 'Image Hover in Catalog' a suboption of 'Image Hover'."

This reverts commit afb1f0a57249398a2f840d6dad2a96c17b1e981a.

Conflicts:
	src/Images/Volume.coffee

src/General/Config.coffee

@@ -182,12 +182,10 @@ 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

src/Images/ImageHover.coffee

@@ -1,11 +1,10 @@
 ImageHover =
   init: ->
-    return unless Conf['Image Hover'] and g.VIEW in ['index', 'thread']
-
-    Post.callbacks.push
-      name: 'Image Hover'
-      cb:   @node
-
+    return if g.VIEW not in ['index', 'thread']
+    if Conf['Image Hover']
+      Post.callbacks.push
+        name: 'Image Hover'
+        cb:   @node
     if Conf['Image Hover in Catalog']
       CatalogThread.callbacks.push
         name: 'Image Hover'

src/Images/Volume.coffee

@@ -1,7 +1,7 @@
 Volume =
   init: ->
     return unless g.VIEW in ['index', 'thread'] and
-      (Conf['Image Expansion'] or Conf['Image Hover'] or Conf['Gallery'])
+      (Conf['Image Expansion'] or Conf['Image Hover'] or Conf['Image Hover in Catalog'] or Conf['Gallery'])
 
     $.sync 'Allow Sound', (x) ->
       Conf['Allow Sound'] = x