Merge branch 'v3'

This commit is contained in:
Zixaphir 2014-03-07 18:57:19 -07:00
commit 072eb92e14
3 changed files with 9 additions and 11 deletions

View File

@ -5946,9 +5946,9 @@
threadExcerpt: function(thread) { threadExcerpt: function(thread) {
var OP, excerpt, _ref; var OP, excerpt, _ref;
OP = thread.OP; OP = thread.OP;
excerpt = ("/" + thread.board + "/ - ") + (((_ref = OP.info.subject) != null ? _ref.trim() : void 0) || OP.info.comment.replace(/\n+/g, ' // ') || OP.getNameBlock()); excerpt = ((_ref = OP.info.subject) != null ? _ref.trim() : void 0) || OP.info.comment.replace(/\n+/g, ' // ') || OP.getNameBlock();
if (excerpt.length > 73) { if (excerpt.length > 70) {
excerpt = "" + excerpt.slice(0, 70) + "..."; excerpt = "" + excerpt.slice(0, 67) + "...";
} }
return "/" + thread.board + "/ - " + excerpt; return "/" + thread.board + "/ - " + excerpt;
}, },

View File

@ -6005,9 +6005,9 @@
threadExcerpt: function(thread) { threadExcerpt: function(thread) {
var OP, excerpt, _ref; var OP, excerpt, _ref;
OP = thread.OP; OP = thread.OP;
excerpt = ("/" + thread.board + "/ - ") + (((_ref = OP.info.subject) != null ? _ref.trim() : void 0) || OP.info.comment.replace(/\n+/g, ' // ') || OP.getNameBlock()); excerpt = ((_ref = OP.info.subject) != null ? _ref.trim() : void 0) || OP.info.comment.replace(/\n+/g, ' // ') || OP.getNameBlock();
if (excerpt.length > 73) { if (excerpt.length > 70) {
excerpt = "" + excerpt.slice(0, 70) + "..."; excerpt = "" + excerpt.slice(0, 67) + "...";
} }
return "/" + thread.board + "/ - " + excerpt; return "/" + thread.board + "/ - " + excerpt;
}, },

View File

@ -1,13 +1,11 @@
Get = Get =
threadExcerpt: (thread) -> threadExcerpt: (thread) ->
{OP} = thread {OP} = thread
excerpt = "/#{thread.board}/ - " + ( excerpt = OP.info.subject?.trim() or
OP.info.subject?.trim() or
OP.info.comment.replace(/\n+/g, ' // ') or OP.info.comment.replace(/\n+/g, ' // ') or
OP.getNameBlock() OP.getNameBlock()
) if excerpt.length > 70
if excerpt.length > 73 excerpt = "#{excerpt[...67]}..."
excerpt = "#{excerpt[...70]}..."
"/#{thread.board}/ - #{excerpt}" "/#{thread.board}/ - #{excerpt}"
threadFromRoot: (root) -> threadFromRoot: (root) ->
g.threads["#{g.BOARD}.#{root.id[1..]}"] g.threads["#{g.BOARD}.#{root.id[1..]}"]