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

This commit is contained in:
ccd0 2015-01-31 23:23:37 -08:00
parent 698533233b
commit afb1f0a572
3 changed files with 9 additions and 6 deletions

View File

@ -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

View File

@ -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'

View File

@ -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]