Use our implementation of Navigating between boards

Our custom navigation should now behave similar to Mayhem's, but
with JSON.

src/General/Config.coffee

@@ -49,6 +49,10 @@ Config =
         true
         'Add buttons to expand threads.'
       ]
+      'Comment Expansion': [
+        false
+        'Expand Comments that are too long to display on the index. Does not work with JSON Navigation.'
+      ]
       'Index Navigation': [
         false
         'Add buttons to navigate between threads.'

src/General/Header.coffee

@@ -144,8 +144,6 @@ Header =
       id: 'board-list'
       innerHTML: "<span id=custom-board-list></span><span id=full-board-list hidden><span class='hide-board-list-container brackets-wrap'><a href=javascript:; class='hide-board-list-button'>&nbsp;-&nbsp;</a></span> #{fourchannav.innerHTML}</span>"
 
-    $.on $('#custom-board-list', Header.boardList), 'click', Index.cb.headerNav if Conf['JSON Navigation']
-
     for a in $$ 'a', boardList
       if Conf['JSON Navigation']
         $.on a, 'click', Navigate.navigate

src/General/Index.coffee

@@ -303,11 +303,6 @@ Index =
       if mode not in ['catalog', Conf['Previous Index Mode']]
         Conf['Previous Index Mode'] = mode
         $.set 'Previous Index Mode', mode
-      return unless QR.nodes
-      if mode is 'catalog'
-        QR.hide()
-      else
-        QR.unhide()
 
     sort: (e) ->
       Index.sort()

src/General/Main.coffee

@@ -321,6 +321,7 @@ Main =
     ['Image Loading',             ImageLoader]
     ['Image Hover',               ImageHover]
     ['Thread Expansion',          ExpandThread]
+    ['Comment Expansion',         ExpandComment]
     ['Thread Excerpt',            ThreadExcerpt]
     ['Favicon',                   Favicon]
     ['Unread',                    Unread]

src/General/Navigate.coffee

@@ -166,7 +166,7 @@ Navigate =
 
   navigate: (e) ->
     return if @hostname isnt 'boards.4chan.org' or window.location.hostname is 'rs.4chan.org' or
-      (e and (e.shiftKey or (e.type is 'click' and e.button isnt 0))) # Not simply a left click
+      (e and (e.shiftKey or e.ctrlKey or (e.type is 'click' and e.button isnt 0))) # Not simply a left click
 
     $.addClass Index.button, 'fa-spin'
 
@@ -174,7 +174,7 @@ Navigate =
     path.shift() if path[0] is ''
     [boardID, view, threadID] = path
 
-    return if view is 'catalog' or 'f' in [boardID, g.BOARD.ID]
+    return if 'f' in [boardID, g.BOARD.ID]
     e.preventDefault() if e
     Navigate.title = -> return
 
@@ -192,6 +192,18 @@ Navigate =
       pageNum = view
       view = 'index' # path is "/boardID/". See the problem?
 
+    {indexMode, indexSort} = @dataset
+    if indexMode and Conf['Index Mode'] isnt indexMode
+      $.set 'Index Mode', indexMode
+      Conf['Index Mode'] = indexMode
+      Index.selectMode.value = indexMode
+      Index.cb.mode()
+    if indexSort and Conf['Index Sort'] isnt indexSort
+      $.set 'Index Sort', indexSort
+      Conf['Index Sort'] = indexSort
+      Index.selectSort.value = indexSort
+      Index.cb.sort()
+
     if view is g.VIEW and boardID is g.BOARD.ID
       Navigate.updateContext view
     else # We've navigated somewhere we weren't before!

src/Miscellaneous/ExpandComment.coffee

@@ -1,6 +1,6 @@
 ExpandComment =
   init: ->
-    return if g.VIEW isnt 'index' or !Conf['Comment Expansion']
+    return if g.VIEW isnt 'index' or !Conf['Comment Expansion'] or Conf['JSON Navigation']
 
     @callbacks.push Fourchan.code if g.BOARD.ID is 'g'
     @callbacks.push Fourchan.math if g.BOARD.ID is 'sci'