restore non-JSON navigation keybinds

This commit is contained in:
ccd0 2014-04-12 04:03:27 -07:00
parent 2064baa227
commit 1ee5c11968

View File

@ -70,7 +70,7 @@ Keybinds =
when 'thread' when 'thread'
ThreadUpdater.update() ThreadUpdater.update()
when 'index' when 'index'
Index.update() if Conf['JSON Navigation'] then Index.update()
when Conf['Watch'] when Conf['Watch']
ThreadWatcher.toggle thread ThreadWatcher.toggle thread
# Images # Images
@ -86,20 +86,33 @@ Keybinds =
FappeTyme.cb.toggle.call {name: 'werk'} FappeTyme.cb.toggle.call {name: 'werk'}
# Board Navigation # Board Navigation
when Conf['Front page'] when Conf['Front page']
if g.VIEW is 'index' if Conf['JSON Navigation'] and g.VIEW is 'index'
Index.userPageNav 0 Index.userPageNav 0
else else
window.location = "/#{g.BOARD}/" window.location = "/#{g.BOARD}/"
when Conf['Open front page'] when Conf['Open front page']
$.open "/#{g.BOARD}/" $.open "/#{g.BOARD}/"
when Conf['Next page'] when Conf['Next page']
return unless g.VIEW is 'index' and Conf['Index Mode'] isnt 'all pages' return unless g.VIEW is 'index'
$('.next button', Index.pagelist).click() if Conf['JSON Navigation']
if Conf['Index Mode'] isnt 'all pages'
$('.next button', Index.pagelist).click()
else
if form = $ '.next form'
window.location = form.action
when Conf['Previous page'] when Conf['Previous page']
return unless g.VIEW is 'index' and Conf['Index Mode'] isnt 'all pages' return unless g.VIEW is 'index'
$('.prev button', Index.pagelist).click() if Conf['JSON Navigation']
if Conf['Index Mode'] isnt 'all pages'
$('.prev button', Index.pagelist).click()
else
if form = $ '.prev form'
window.location = form.action
when Conf['Search form'] when Conf['Search form']
Index.searchInput.focus() if Conf['JSON Navigation']
Index.searchInput.focus()
else
$.id('search-btn').click()
when Conf['Open catalog'] when Conf['Open catalog']
if Conf['External Catalog'] if Conf['External Catalog']
window.location = CatalogLinks.external(g.BOARD.ID) window.location = CatalogLinks.external(g.BOARD.ID)