From ceff7c5d5fa4030e04b001a949259caafb4c3348 Mon Sep 17 00:00:00 2001
From: Mayhem <stepien.nicolas@gmail.com>
Date: Tue, 3 Dec 2013 11:36:43 +0100
Subject: [PATCH] Add Refreshed Navigation setting. Close #1323, #1332.

---
 CHANGELOG.md                      |  1 +
 src/General/Config.coffee         |  1 +
 src/General/Index.coffee          | 43 ++++++++++++++++++++++---------
 src/Miscellaneous/Keybinds.coffee |  2 +-
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 060462cd2..2d218f82c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 - More index navigation improvements:
  - New setting: `Anchor Hidden Threads`, enabled by default. Hidden threads will be moved at the end of the index to fill the first pages.
+ - New setting: `Refreshed Navigation`, disabled by default. When enabled, navigating through pages will refresh the index.
 
 ### 3.14.3 - *2013-12-09*
 
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 39b025920..14b665337 100644
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -144,6 +144,7 @@ Config =
     'Index Sort': 'bump'
     'Show Replies': true
     'Anchor Hidden Threads': true
+    'Refreshed Navigation': false
   Header:
     'Header auto-hide':           false
     'Header auto-hide on scroll': false
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index cae8482a7..30b151caf 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -37,10 +37,17 @@ Index =
       $.on input, 'change', @cb.sort
 
     repliesEntry =
-      el: $.el 'label', innerHTML: '<input type=checkbox name="Show Replies"> Show replies'
+      el: $.el 'label',
+        innerHTML: '<input type=checkbox name="Show Replies"> Show replies'
     anchorEntry =
-      el: $.el 'label', innerHTML: '<input type=checkbox name="Anchor Hidden Threads" title="Move hidden threads at the end of the index."> Anchor hidden threads'
-    for label in [repliesEntry, anchorEntry]
+      el: $.el 'label',
+        innerHTML: '<input type=checkbox name="Anchor Hidden Threads"> Anchor hidden threads'
+        title: 'Move hidden threads at the end of the index.'
+    refNavEntry =
+      el: $.el 'label',
+        innerHTML: '<input type=checkbox name="Refreshed Navigation"> Refreshed navigation'
+        title: 'Refresh index when navigating through pages.'
+    for label in [repliesEntry, anchorEntry, refNavEntry]
       input = label.el.firstChild
       {name} = input
       input.checked = Conf[name]
@@ -56,7 +63,7 @@ Index =
       el: $.el 'span',
         textContent: 'Index Navigation'
       order: 90
-      subEntries: [modeEntry, sortEntry, repliesEntry, anchorEntry]
+      subEntries: [modeEntry, sortEntry, repliesEntry, anchorEntry, refNavEntry]
 
     $.addClass doc, 'index-loading'
     @update()
@@ -118,13 +125,18 @@ Index =
           return
       return if a.textContent is 'Catalog'
       e.preventDefault()
-      Index.pageNav +a.pathname.split('/')[2]
+      Index.userPageNav +a.pathname.split('/')[2]
 
   scrollToIndex: ->
     Header.scrollToIfNeeded Index.root
 
   getCurrentPage: ->
     +window.location.pathname.split('/')[2]
+  userPageNav: (pageNum) ->
+    if Conf['Refreshed Navigation'] and Conf['Index Mode'] is 'paged'
+      Index.update pageNum
+    else
+      Index.pageNav pageNum
   pageNav: (pageNum) ->
     return if Index.currentPage is pageNum
     history.pushState null, '', if pageNum is 0 then './' else pageNum
@@ -181,7 +193,7 @@ Index =
     $.before a, strong
     $.add strong, a
 
-  update: ->
+  update: (pageNum) ->
     return unless navigator.onLine
     Index.req?.abort()
     Index.notice?.close()
@@ -196,13 +208,14 @@ Index =
           return unless Index.req and !Index.notice
           Index.notice = new Notice 'info', 'Refreshing index...'
         ), 5 * $.SECOND - (Date.now() - now)
+    onload = (e) -> Index.load e, pageNum
     Index.req = $.ajax "//a.4cdn.org/#{g.BOARD}/catalog.json",
-      onabort:   Index.load
-      onloadend: Index.load
+      onabort:   onload
+      onloadend: onload
     ,
       whenModified: true
     $.addClass Index.button, 'fa-spin'
-  load: (e) ->
+  load: (e, pageNum) ->
     $.rmClass Index.button, 'fa-spin'
     {req, notice} = Index
     delete Index.req
@@ -214,7 +227,10 @@ Index =
       return
 
     try
-      Index.parse JSON.parse req.response if req.status is 200
+      if req.status is 200
+        Index.parse JSON.parse(req.response), pageNum
+      else if req.status is 304 and pageNum?
+        Index.pageNav pageNum
     catch err
       c.error 'Index failure:', err.stack
       # network error or non-JSON content for example.
@@ -235,12 +251,15 @@ Index =
     timeEl.dataset.utc = e.timeStamp <% if (type === 'userscript') { %>/ 1000<% } %>
     RelativeDates.update timeEl
     Index.scrollToIndex()
-  parse: (pages) ->
+  parse: (pages, pageNum) ->
     Index.parseThreadList pages
     Index.buildThreads()
     Index.sort()
-    Index.buildIndex()
     Index.buildPagelist()
+    if pageNum?
+      Index.pageNav pageNum
+      return
+    Index.buildIndex()
     Index.setPage()
   parseThreadList: (pages) ->
     Index.pagesNum          = pages.length
diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee
index 76370e38c..c158cb183 100644
--- a/src/Miscellaneous/Keybinds.coffee
+++ b/src/Miscellaneous/Keybinds.coffee
@@ -75,7 +75,7 @@ Keybinds =
       # Board Navigation
       when Conf['Front page']
         if g.VIEW is 'index'
-          Index.pageNav 0
+          Index.userPageNav 0
         else
           window.location = "/#{g.BOARD}/"
       when Conf['Open front page']