Initial index catalog mode work.

This commit is contained in:
Mayhem 2014-01-25 17:01:06 +01:00
parent c430e97afd
commit 154ad07cd7
5 changed files with 101 additions and 9 deletions

View File

@ -401,6 +401,34 @@ a[href="javascript:;"] {
.summary { .summary {
text-decoration: none; text-decoration: none;
} }
.catalog-mode {
text-align: center;
}
.catalog-thread {
display: inline-block;
vertical-align: top;
padding-top: 5px;
width: 165px;
max-height: 320px;
overflow: hidden;
word-break: break-word;
}
.thumb {
max-width: 150px;
max-height: 150px;
box-shadow: 0 0 5px rgba(0, 0, 0, .25);
}
.thread-stats {
cursor: help;
font-size: 10px;
font-weight: 700;
line-height: .8;
margin-top: 1px;
float: none;
}
.catalog-thread .subject {
font-weight: 700;
}
/* Announcement Hiding */ /* Announcement Hiding */
:root.hide-announcement #globalMessage, :root.hide-announcement #globalMessage,

View File

@ -0,0 +1,8 @@
<a href="/#{thread.board}/res/#{thread.ID}" target="_blank">
<img src="#{src}" class="thumb" width="#{imgWidth}" height="#{imgHeight}">
</a>
<div class="thread-stats" title="Post count / File count / Page count">
<span class="post-count">#{postCount}</span> / <span class="file-count">#{fileCount}</span> / <span class="page-count">#{pageCount}</span>
</div>
#{subject}
<div class="comment">#{comment}</div>

View File

@ -254,9 +254,49 @@ Build =
[posts, files] = if Conf['Show Replies'] [posts, files] = if Conf['Show Replies']
[data.omitted_posts, data.omitted_images] [data.omitted_posts, data.omitted_images]
else else
# XXX data.images is not accurate. [data.replies, data.images]
[data.replies, data.omitted_images + data.last_replies.filter((data) -> !!data.ext).length]
nodes.push Build.summary board.ID, data.no, posts, files nodes.push Build.summary board.ID, data.no, posts, files
$.add root, nodes $.add root, nodes
root root
threadCatalog: (thread) ->
for data in Index.liveThreadData
break if data.no is thread.ID
if data.spoiler and !Conf['Reveal Spoilers']
src = "#{Build.staticPath}spoiler"
if spoilerRange = Build.spoilerRange[thread.board]
# Randomize the spoiler image.
src += "-#{thread.board}" + Math.floor 1 + spoilerRange * Math.random()
src += '.png'
imgWidth = imgHeight = 100
else if data.filedeleted
src = "#{Build.staticPath}filedeleted-res#{Build.gifIcon}"
imgWidth = 127
imgHeight = 13
else
src = thread.OP.file.thumbURL
max = Math.max data.tn_w, data.tn_h
imgWidth = data.tn_w * 150 / max
imgHeight = data.tn_h * 150 / max
postCount = data.replies + 1
fileCount = data.images + !!data.ext
pageCount = Math.floor Index.liveThreadIDs.indexOf(thread.ID) / Index.threadsNumPerPage
subject = if thread.OP.info.subject
"<div class='subject'>#{thread.OP.info.subject}</div>"
else
''
comment = thread.OP.nodes.comment.innerHTML.replace /(<br>){2,}/g, '<br>'
root = $.el 'div',
className: 'catalog-thread'
innerHTML: <%= importHTML('General/Thread-catalog-view') %>
if data.bumplimit
$.addClass $('.post-count', root), 'warning'
if data.imagelimit
$.addClass $('.file-count', root), 'warning'
root

View File

@ -14,6 +14,7 @@ Index =
subEntries: [ subEntries: [
{ el: $.el 'label', innerHTML: '<input type=radio name="Index Mode" value="paged"> Paged' } { el: $.el 'label', innerHTML: '<input type=radio name="Index Mode" value="paged"> Paged' }
{ el: $.el 'label', innerHTML: '<input type=radio name="Index Mode" value="all pages"> All threads' } { el: $.el 'label', innerHTML: '<input type=radio name="Index Mode" value="all pages"> All threads' }
{ el: $.el 'label', innerHTML: '<input type=radio name="Index Mode" value="catalog"> Catalog' }
] ]
for label in modeEntry.subEntries for label in modeEntry.subEntries
input = label.el.firstChild input = label.el.firstChild
@ -68,6 +69,7 @@ Index =
$.addClass doc, 'index-loading' $.addClass doc, 'index-loading'
@update() @update()
@root = $.el 'div', className: 'board' @root = $.el 'div', className: 'board'
Index.cb.rootClass()
@pagelist = $.el 'div', @pagelist = $.el 'div',
className: 'pagelist' className: 'pagelist'
hidden: true hidden: true
@ -101,7 +103,10 @@ Index =
$.replace $('.pagelist'), Index.pagelist $.replace $('.pagelist'), Index.pagelist
cb: cb:
rootClass: ->
(if Conf['Index Mode'] is 'catalog' then $.addClass else $.rmClass) Index.root, 'catalog-mode'
mode: -> mode: ->
Index.cb.rootClass()
Index.togglePagelist() Index.togglePagelist()
Index.buildIndex() Index.buildIndex()
sort: -> sort: ->
@ -368,14 +373,21 @@ Index =
Index.sortedNodes.splice offset++ * 2, 0, Index.sortedNodes.splice(i, 2)... Index.sortedNodes.splice offset++ * 2, 0, Index.sortedNodes.splice(i, 2)...
return return
buildIndex: -> buildIndex: ->
if Conf['Index Mode'] is 'paged' switch Conf['Index Mode']
pageNum = Index.getCurrentPage() when 'paged'
nodesPerPage = Index.threadsNumPerPage * 2 pageNum = Index.getCurrentPage()
nodes = Index.sortedNodes[nodesPerPage * pageNum ... nodesPerPage * (pageNum + 1)] nodesPerPage = Index.threadsNumPerPage * 2
else nodes = Index.sortedNodes[nodesPerPage * pageNum ... nodesPerPage * (pageNum + 1)]
nodes = Index.sortedNodes when 'catalog'
nodes = Index.sortedNodes
.filter((n, i) -> !(i % 2))
.map((threadRoot) -> Get.threadFromRoot threadRoot)
.filter((thread) -> !thread.isHidden)
.map (thread) -> thread.getCatalogView()
else
nodes = Index.sortedNodes
$.rmAll Index.root $.rmAll Index.root
Index.buildReplies nodes if Conf['Show Replies'] Index.buildReplies nodes if Conf['Show Replies'] and Conf['Index Mode'] isnt 'catalog'
$.event 'IndexBuild', nodes $.event 'IndexBuild', nodes
$.add Index.root, nodes $.add Index.root, nodes

View File

@ -39,6 +39,10 @@ class Thread
$ '[title="Quote this post"]', @OP.nodes.info $ '[title="Quote this post"]', @OP.nodes.info
$.after root, [$.tn(' '), icon] $.after root, [$.tn(' '), icon]
getCatalogView: ->
return @catalogView if @catalogView
@catalogView = Build.threadCatalog @
kill: -> kill: ->
@isDead = true @isDead = true
@timeOfDeath = Date.now() @timeOfDeath = Date.now()