From 97cc25799d6c8a7a2645c98fef842fbf53a8d28b Mon Sep 17 00:00:00 2001 From: ccd0 Date: Mon, 2 Feb 2015 00:05:29 -0800 Subject: [PATCH] Revert "Make 'Image Hover in Catalog' a suboption of 'Image Hover'." This reverts commit afb1f0a57249398a2f840d6dad2a96c17b1e981a. Conflicts: src/Images/Volume.coffee --- src/General/Config.coffee | 2 -- src/Images/ImageHover.coffee | 11 +++++------ src/Images/Volume.coffee | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/General/Config.coffee b/src/General/Config.coffee index 0aea5afea..f90ffe884 100755 --- a/src/General/Config.coffee +++ b/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 diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee index b3588df09..99bdf440e 100755 --- a/src/Images/ImageHover.coffee +++ b/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' diff --git a/src/Images/Volume.coffee b/src/Images/Volume.coffee index 079d4bb54..fc82a973b 100644 --- a/src/Images/Volume.coffee +++ b/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