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

Move file div from post into catalog node; display file info on hover.

Browse Source
This commit is contained in:
ccd0 2016-09-23 01:10:21 -07:00
parent 88efaeae67
commit e496de4f6a
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/General/Build.coffee
View File

@ -222,6 +222,7 @@ Build =
root.dataset.fullID = thread.fullID root.dataset.fullID = thread.fullID
$.addClass root, thread.OP.highlights... if thread.OP.highlights $.addClass root, thread.OP.highlights... if thread.OP.highlights
$.addClass root, 'noFile' unless thread.OP.file
if thread.isSticky if thread.isSticky
$.add $('.catalog-icons', root), $.el 'img', $.add $('.catalog-icons', root), $.el 'img',

3
src/General/Index.coffee
View File

@ -716,9 +716,10 @@ Index =
isCatalog = (Conf['Index Mode'] is 'catalog') isCatalog = (Conf['Index Mode'] is 'catalog')
for thread in threads for thread in threads
node = if isCatalog then thread.catalogView.nodes.root else thread.OP.nodes.post node = if isCatalog then thread.catalogView.nodes.root else thread.OP.nodes.post
{info, comment} = thread.OP.nodes {fileRoot, info, comment} = thread.OP.nodes
unless node.contains comment unless node.contains comment
comment.className = if isCatalog then 'comment' else 'postMessage' comment.className = if isCatalog then 'comment' else 'postMessage'
$.prepend node, fileRoot if fileRoot
$.add node, [info, comment] $.add node, [info, comment]
return return

1
src/classes/Post.Clone.coffee
View File

@ -14,6 +14,7 @@ Post.Clone = class extends Post
root = cloneNode nodes.root root = cloneNode nodes.root
# Handle case where comment has been moved into catalog thread # Handle case where comment has been moved into catalog thread
if nodes.comment.parentNode isnt nodes.post if nodes.comment.parentNode isnt nodes.post
$.prepend $('.post', root), cloneNode(nodes.fileRoot) if nodes.fileRoot
$.add $('.post', root), [cloneNode(nodes.info), cloneNode(nodes.comment)] $.add $('.post', root), [cloneNode(nodes.info), cloneNode(nodes.comment)]
Post.Clone.prefix or= 0 Post.Clone.prefix or= 0
for node in [root, $$('[id]', root)...] for node in [root, $$('[id]', root)...]

32
src/css/style.css
View File

@ -729,9 +729,12 @@ div.catalog-thread {
border-right: 1px solid transparent; border-right: 1px solid transparent;
} }
.catalog-thread > :first-child { .catalog-thread > :first-child {
margin-top: -1px; margin-top: -21px;
border-top: 1px solid transparent; border-top: 1px solid transparent;
} }
.catalog-thread.noFile > :first-child {
padding-top: 20px;
}
.catalog-thread > :last-child { .catalog-thread > :last-child {
margin-bottom: -1px; margin-bottom: -1px;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
@ -788,21 +791,30 @@ div.catalog-thread {
.catalog-stats > [title] { .catalog-stats > [title] {
cursor: help; cursor: help;
} }
#delform .catalog-thread:not(:hover) > .file,
#delform .catalog-thread:not(:hover) > .postInfo,
#delform .catalog-thread > .file > :not(.fileText),
#delform .catalog-thread > .file > .fileText > :not(:first-child),
#delform .catalog-thread > .postInfo > :not(.nameBlock):not(.dateTime),
#delform .catalog-thread .posteruid {
display: none;
}
.catalog-thread .fileText {
min-height: 16px;
font-size: 10px;
line-height: 1;
padding: 2px;
}
#delform .catalog-thread > .postInfo { #delform .catalog-thread > .postInfo {
width: auto; width: auto;
} }
#delform .catalog-thread > .postInfo > * { .catalog-thread .subject {
display: none;
}
#delform .catalog-thread > .postInfo > .subject {
display: block; display: block;
} }
.catalog-thread .dateTime { .catalog-thread .dateTime {
display: inline-block;
font-style: italic; font-style: italic;
} }
.catalog-thread .posteruid {
display: none;
}
.catalog-thread:hover { .catalog-thread:hover {
overflow: visible; overflow: visible;
z-index: 1; z-index: 1;
@ -811,10 +823,6 @@ div.catalog-thread {
margin-left: -61px; margin-left: -61px;
margin-right: -61px; margin-right: -61px;
} }
#delform .catalog-thread:hover > .postInfo > .nameBlock,
#delform .catalog-thread:hover > .postInfo > .dateTime {
display: inline-block;
}
.catalog-thread .prettyprinted { .catalog-thread .prettyprinted {
max-width: 100%; max-width: 100%;
box-sizing: border-box; box-sizing: border-box;