From 5ab31d5e75f9a2bef7c7a2925423e4553bfa26b0 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 12 Apr 2014 17:02:08 -0700
Subject: [PATCH] fix JSON navigation history bugs

---
 src/General/Index.coffee    | 3 ++-
 src/General/Navigate.coffee | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 1fc908b24..7e4ae9c9c 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -163,13 +163,13 @@ Index =
   getCurrentPage: ->
     +window.location.pathname.split('/')[2]
   userPageNav: (pageNum) ->
+    Navigate.pushState if pageNum is 0 then './' else pageNum
     if Conf['Refreshed Navigation'] and Conf['Index Mode'] isnt 'all pages'
       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
     Index.pageLoad pageNum
   pageLoad: (pageNum) ->
     Index.currentPage = pageNum
@@ -492,6 +492,7 @@ Index =
       Index.buildIndex()
       Index.setPage()
     else
+      Navigate.pushState if pageNum is 0 then './' else pageNum
       Index.pageNav pageNum
 
   querySearch: (query) ->
diff --git a/src/General/Navigate.coffee b/src/General/Navigate.coffee
index 14fa10b14..32a5f9c0e 100644
--- a/src/General/Navigate.coffee
+++ b/src/General/Navigate.coffee
@@ -198,7 +198,7 @@ Navigate =
     if threadID
       view = 'thread'
     else
-      pageNum = view
+      pageNum = +view
       view = 'index' # path is "/boardID/". See the problem?
 
     if view is g.VIEW and boardID is g.BOARD.ID
@@ -302,6 +302,10 @@ Navigate =
     if Conf['Unread Count']
       Navigate.ready 'Unread Count', Unread.ready, Conf['Unread Count']
 
+  pushState: (path) ->
+    history.pushState null, '', path
+    Navigate.path = window.location.pathname
+
   popstate: ->
     return if window.location.pathname is Navigate.path
     a = $.el 'a',