Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit afb1f0a57249398a2f840d6dad2a96c17b1e981a.

Conflicts:
	src/Images/Volume.coffee
This commit is contained in:
ccd0 2015-02-02 00:05:29 -08:00
parent ea546ecfb8
commit 97cc25799d
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/General/Config.coffee
View File

@ -182,12 +182,10 @@ Config =
'Image Hover in Catalog': [ 'Image Hover in Catalog': [
false false
'Show full image / video on mouseover in <%= meta.name %> catalog.' 'Show full image / video on mouseover in <%= meta.name %> catalog.'
1
] ]
'Mouse Wheel Volume': [ 'Mouse Wheel Volume': [
true true
'Adjust volume of hovering videos with mouse wheel.' 'Adjust volume of hovering videos with mouse wheel.'
1
] ]
'Gallery': [ 'Gallery': [
true true

11
src/Images/ImageHover.coffee
View File

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

2
src/Images/Volume.coffee
View File

@ -1,7 +1,7 @@
Volume = Volume =
init: -> init: ->
return unless g.VIEW in ['index', 'thread'] and 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) -> $.sync 'Allow Sound', (x) ->
Conf['Allow Sound'] = x Conf['Allow Sound'] = x