fix stuff that should be conditional on 'JSON Navigation' setting

This commit is contained in:
ccd0 2014-09-19 14:51:18 -07:00
parent d70c7c0e51
commit 3e753bad21
2 changed files with 5 additions and 5 deletions

View File

@ -1,6 +1,6 @@
ThreadHiding = ThreadHiding =
init: -> init: ->
return if g.VIEW isnt 'index' return if g.VIEW isnt 'index' or !Conf['Thread Hiding Buttons'] and !Conf['Thread Hiding Link'] and !Conf['JSON Navigation']
@db = new DataBoard 'hiddenThreads' @db = new DataBoard 'hiddenThreads'
@syncCatalog() @syncCatalog()
@ -81,7 +81,7 @@ ThreadHiding =
el: div el: div
order: 20 order: 20
open: ({thread, isReply}) -> open: ({thread, isReply}) ->
if isReply or thread.isHidden or Conf['Index Mode'] is 'catalog' if isReply or thread.isHidden or Conf['JSON Navigation'] and Conf['Index Mode'] is 'catalog'
return false return false
ThreadHiding.menu.thread = thread ThreadHiding.menu.thread = thread
true true
@ -188,7 +188,7 @@ ThreadHiding =
return if thread.isHidden return if thread.isHidden
threadRoot = thread.OP.nodes.root.parentNode threadRoot = thread.OP.nodes.root.parentNode
thread.isHidden = true thread.isHidden = true
Index.updateHideLabel() Index.updateHideLabel() if Conf['JSON Navigation']
return threadRoot.hidden = true unless makeStub return threadRoot.hidden = true unless makeStub
@ -200,4 +200,4 @@ ThreadHiding =
delete thread.stub delete thread.stub
threadRoot = thread.OP.nodes.root.parentNode threadRoot = thread.OP.nodes.root.parentNode
threadRoot.hidden = thread.isHidden = false threadRoot.hidden = thread.isHidden = false
Index.updateHideLabel() Index.updateHideLabel() if Conf['JSON Navigation']

View File

@ -144,7 +144,7 @@ Index =
menu: menu:
init: -> init: ->
return if g.VIEW isnt 'index' or !Conf['Menu'] or g.BOARD.ID is 'f' return if g.VIEW isnt 'index' or !Conf['JSON Navigation'] or !Conf['Menu'] or g.BOARD.ID is 'f'
Menu.menu.addEntry Menu.menu.addEntry
el: $.el 'a', href: 'javascript:;' el: $.el 'a', href: 'javascript:;'