fix JSON navigation history bugs
This commit is contained in:
parent
8a5cd7a610
commit
5ab31d5e75
@ -163,13 +163,13 @@ Index =
|
|||||||
getCurrentPage: ->
|
getCurrentPage: ->
|
||||||
+window.location.pathname.split('/')[2]
|
+window.location.pathname.split('/')[2]
|
||||||
userPageNav: (pageNum) ->
|
userPageNav: (pageNum) ->
|
||||||
|
Navigate.pushState if pageNum is 0 then './' else pageNum
|
||||||
if Conf['Refreshed Navigation'] and Conf['Index Mode'] isnt 'all pages'
|
if Conf['Refreshed Navigation'] and Conf['Index Mode'] isnt 'all pages'
|
||||||
Index.update pageNum
|
Index.update pageNum
|
||||||
else
|
else
|
||||||
Index.pageNav pageNum
|
Index.pageNav pageNum
|
||||||
pageNav: (pageNum) ->
|
pageNav: (pageNum) ->
|
||||||
return if Index.currentPage is pageNum
|
return if Index.currentPage is pageNum
|
||||||
history.pushState null, '', if pageNum is 0 then './' else pageNum
|
|
||||||
Index.pageLoad pageNum
|
Index.pageLoad pageNum
|
||||||
pageLoad: (pageNum) ->
|
pageLoad: (pageNum) ->
|
||||||
Index.currentPage = pageNum
|
Index.currentPage = pageNum
|
||||||
@ -492,6 +492,7 @@ Index =
|
|||||||
Index.buildIndex()
|
Index.buildIndex()
|
||||||
Index.setPage()
|
Index.setPage()
|
||||||
else
|
else
|
||||||
|
Navigate.pushState if pageNum is 0 then './' else pageNum
|
||||||
Index.pageNav pageNum
|
Index.pageNav pageNum
|
||||||
|
|
||||||
querySearch: (query) ->
|
querySearch: (query) ->
|
||||||
|
|||||||
@ -198,7 +198,7 @@ Navigate =
|
|||||||
if threadID
|
if threadID
|
||||||
view = 'thread'
|
view = 'thread'
|
||||||
else
|
else
|
||||||
pageNum = view
|
pageNum = +view
|
||||||
view = 'index' # path is "/boardID/". See the problem?
|
view = 'index' # path is "/boardID/". See the problem?
|
||||||
|
|
||||||
if view is g.VIEW and boardID is g.BOARD.ID
|
if view is g.VIEW and boardID is g.BOARD.ID
|
||||||
@ -302,6 +302,10 @@ Navigate =
|
|||||||
if Conf['Unread Count']
|
if Conf['Unread Count']
|
||||||
Navigate.ready 'Unread Count', Unread.ready, Conf['Unread Count']
|
Navigate.ready 'Unread Count', Unread.ready, Conf['Unread Count']
|
||||||
|
|
||||||
|
pushState: (path) ->
|
||||||
|
history.pushState null, '', path
|
||||||
|
Navigate.path = window.location.pathname
|
||||||
|
|
||||||
popstate: ->
|
popstate: ->
|
||||||
return if window.location.pathname is Navigate.path
|
return if window.location.pathname is Navigate.path
|
||||||
a = $.el 'a',
|
a = $.el 'a',
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user