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

Index.sortedThreads -> Index.sortedThreadIDs

Browse Source
This commit is contained in:
ccd0 2016-10-01 16:38:37 -07:00
parent 545ece6c8e
commit 93f303da51
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/General/Index.coffee
View File

@ -159,7 +159,8 @@ Index =
pageNum = ++Index.pageNum pageNum = ++Index.pageNum
return Index.endNotice() if pageNum > Index.pagesNum return Index.endNotice() if pageNum > Index.pagesNum
threads = Index.threadsOnPage pageNum threadIDs = Index.threadsOnPage pageNum
threads = threadIDs.map (ID) -> g.BOARD.threads[ID]
Index.buildStructure threads Index.buildStructure threads
endNotice: do -> endNotice: do ->
@ -438,7 +439,7 @@ Index =
getPagesNum: -> getPagesNum: ->
if Index.search if Index.search
Math.ceil Index.sortedThreads.length / Index.threadsNumPerPage Math.ceil Index.sortedThreadIDs.length / Index.threadsNumPerPage
else else
Index.pagesNum Index.pagesNum
@ -704,7 +705,7 @@ Index =
sort: -> sort: ->
{liveThreadIDs, liveThreadData} = Index {liveThreadIDs, liveThreadData} = Index
return unless liveThreadData return unless liveThreadData
sortedThreadIDs = switch Index.currentSort Index.sortedThreadIDs = switch Index.currentSort
when 'lastreply' when 'lastreply'
[liveThreadData...].sort((a, b) -> [liveThreadData...].sort((a, b) ->
a = num[num.length - 1] if (num = a.last_replies) a = num[num.length - 1] if (num = a.last_replies)
@ -723,9 +724,8 @@ Index =
when 'birth' then [liveThreadIDs... ].sort (a, b) -> b - a when 'birth' then [liveThreadIDs... ].sort (a, b) -> b - a
when 'replycount' then [liveThreadData...].sort((a, b) -> b.replies - a.replies).map (post) -> post.no when 'replycount' then [liveThreadData...].sort((a, b) -> b.replies - a.replies).map (post) -> post.no
when 'filecount' then [liveThreadData...].sort((a, b) -> b.images - a.images ).map (post) -> post.no when 'filecount' then [liveThreadData...].sort((a, b) -> b.images - a.images ).map (post) -> post.no
Index.sortedThreads = sortedThreadIDs.map (threadID) -> g.BOARD.threads[threadID] if Index.search and (threadIDs = Index.querySearch Index.search)
if Index.search and (threads = Index.querySearch Index.search) Index.sortedThreadIDs = threadIDs
Index.sortedThreads = threads
# Sticky threads # Sticky threads
Index.sortOnTop (thread) -> thread.isSticky Index.sortOnTop (thread) -> thread.isSticky
# Highlighted threads # Highlighted threads
@ -736,19 +736,20 @@ Index =
sortOnTop: (match) -> sortOnTop: (match) ->
topThreads = [] topThreads = []
bottomThreads = [] bottomThreads = []
for thread in Index.sortedThreads for ID in Index.sortedThreadIDs
(if match thread then topThreads else bottomThreads).push thread (if match g.BOARD.threads[ID] then topThreads else bottomThreads).push ID
Index.sortedThreads = topThreads.concat bottomThreads Index.sortedThreadIDs = topThreads.concat bottomThreads
buildIndex: -> buildIndex: ->
return unless Index.liveThreadData return unless Index.liveThreadData
switch Conf['Index Mode'] switch Conf['Index Mode']
when 'all pages' when 'all pages'
threads = Index.sortedThreads threadIDs = Index.sortedThreadIDs
when 'catalog' when 'catalog'
threads = Index.sortedThreads.filter (thread) -> !thread.isHidden isnt Index.showHiddenThreads threadIDs = Index.sortedThreadIDs.filter (ID) -> !g.BOARD.threads[ID].isHidden isnt Index.showHiddenThreads
else else
threads = Index.threadsOnPage Index.currentPage threadIDs = Index.threadsOnPage Index.currentPage
threads = threadIDs.map (ID) -> g.BOARD.threads[ID]
delete Index.pageNum delete Index.pageNum
$.rmAll Index.root $.rmAll Index.root
$.rmAll Header.hover $.rmAll Header.hover
@ -760,7 +761,7 @@ Index =
threadsOnPage: (pageNum) -> threadsOnPage: (pageNum) ->
nodesPerPage = Index.threadsNumPerPage nodesPerPage = Index.threadsNumPerPage
offset = nodesPerPage * (pageNum - 1) offset = nodesPerPage * (pageNum - 1)
Index.sortedThreads[offset ... offset + nodesPerPage] Index.sortedThreadIDs[offset ... offset + nodesPerPage]
buildStructure: (threads) -> buildStructure: (threads) ->
Index.buildReplies threads if Conf['Show Replies'] Index.buildReplies threads if Conf['Show Replies']
@ -818,8 +819,8 @@ Index =
querySearch: (query) -> querySearch: (query) ->
return if not (keywords = query.toLowerCase().match /\S+/g) return if not (keywords = query.toLowerCase().match /\S+/g)
Index.sortedThreads.filter (thread) -> Index.sortedThreadIDs.filter (ID) ->
Index.searchMatch thread, keywords Index.searchMatch g.BOARD.threads[ID], keywords
searchMatch: (thread, keywords) -> searchMatch: (thread, keywords) ->
{info, file} = thread.OP {info, file} = thread.OP