From efe2ff5d70857d4b25bb5b5c3b455ab879200d4c Mon Sep 17 00:00:00 2001 From: Nick Gordon Date: Fri, 22 Nov 2013 10:38:40 -0800 Subject: [PATCH] super awesome mega-fix with unintended awesome collateral-fixes * markdown supported in chat * by proxy, paragraphs are *also* supported in chat now * AND EVEN PROXIER, the issue with emoji not showing properly is fixed --- public/css/game-pane.styl | 5 +++++ views/options/social/chat-message.jade | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/public/css/game-pane.styl b/public/css/game-pane.styl index 34ad09f5f9..74236ced21 100644 --- a/public/css/game-pane.styl +++ b/public/css/game-pane.styl @@ -29,6 +29,11 @@ .own-message border-left: 4px solid #333 padding-left: 2px + + markdown + + p:first-child + display:inline // Name tags .label-contributor-1, .label-contributor-2 diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade index 8c0dfa08db..65f747df51 100644 --- a/views/options/social/chat-message.jade +++ b/views/options/social/chat-message.jade @@ -2,7 +2,7 @@ li(ng-repeat='message in group.chat', ng-class='{highlight: isUserMentioned(user a.label.chat-message(class='label-contributor-{{message.contributor.level}}', ng-class='{"label-npc": message.backer.npc}', ng-click='clickMember(message.uuid, true)') span(tooltip='{{contribText(message.contributor, message.backer)}}') {{message.user}}  |   - span(ng-bind-html="message.text | linky:'_blank'") + markdown(ng-model='message.text') |  -  span.muted.time(from-now='message.timestamp') a(ng-show='user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)')