Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary use of Index.getCurrentPage.

Browse Source
This commit is contained in:
ccd0 2015-07-18 20:24:51 -07:00
parent 49b947c804
commit 029ce9fe37
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/General/Index.coffee
View File

@ -130,7 +130,7 @@ Index =
scroll: -> scroll: ->
return if Index.req or Conf['Index Mode'] isnt 'infinite' or (window.scrollY <= doc.scrollHeight - (300 + window.innerHeight)) return if Index.req or Conf['Index Mode'] isnt 'infinite' or (window.scrollY <= doc.scrollHeight - (300 + window.innerHeight))
Index.pageNum = Index.getCurrentPage() unless Index.pageNum? # Avoid having to pushState to keep track of the current page Index.pageNum ?= Index.currentPage # Avoid having to pushState to keep track of the current page
pageNum = ++Index.pageNum pageNum = ++Index.pageNum
return Index.endNotice() if pageNum > Index.pagesNum return Index.endNotice() if pageNum > Index.pagesNum
@ -386,7 +386,7 @@ Index =
$.add pagesRoot, nodes $.add pagesRoot, nodes
setPage: -> setPage: ->
pageNum = Index.getCurrentPage() pageNum = Index.currentPage
maxPageNum = Index.getMaxPageNum() maxPageNum = Index.getMaxPageNum()
pagesRoot = $ '.pages', Index.pagelist pagesRoot = $ '.pages', Index.pagelist
@ -644,10 +644,10 @@ Index =
i = 0 i = 0
i++ while Index.followedThreadID isnt Get.threadFromRoot(Index.sortedNodes[i]).ID i++ while Index.followedThreadID isnt Get.threadFromRoot(Index.sortedNodes[i]).ID
page = i // Index.threadsNumPerPage + 1 page = i // Index.threadsNumPerPage + 1
if page isnt Index.getCurrentPage() if page isnt Index.currentPage
Index.currentPage = page Index.currentPage = page
Index.pushState {page} Index.pushState {page}
nodes = Index.buildSinglePage Index.getCurrentPage() nodes = Index.buildSinglePage Index.currentPage
$.rmAll Index.root $.rmAll Index.root
$.rmAll Header.hover $.rmAll Header.hover
if Conf['Index Mode'] is 'catalog' if Conf['Index Mode'] is 'catalog'