From 4dbcdc366c5c1a97e52b16007241d6095e589ace Mon Sep 17 00:00:00 2001 From: Gabriel Engel <gabriel.engel@fgsys.com> Date: Thu, 18 Jun 2015 22:19:26 -0300 Subject: [PATCH] code cleanup --- client/views/app/chatMessageDashboard.coffee | 18 +++++++++--------- client/views/app/chatMessageDashboard.html | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/views/app/chatMessageDashboard.coffee b/client/views/app/chatMessageDashboard.coffee index 38e8b4f77f5..cdbddd720b7 100644 --- a/client/views/app/chatMessageDashboard.coffee +++ b/client/views/app/chatMessageDashboard.coffee @@ -2,14 +2,11 @@ Template.chatMessageDashboard.helpers own: -> return 'own' if this.u?._id is Meteor.userId() - messageDate: (date) -> - return moment(date).format('LL') - - isSystemMessage: -> - return this.t in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'nu', 'wm', 'uj'] + time: -> + return moment(this.ts).format('HH:mm') - isEditing: -> - return this._id is Session.get('editingMessageId') + date: -> + return moment(this.ts).format('LL') message: -> switch this.t @@ -28,8 +25,11 @@ Template.chatMessageDashboard.helpers this.html = message.html.replace /\n/gm, '<br/>' return this.html - time: -> - return moment(this.ts).format('HH:mm') + isSystemMessage: -> + return this.t in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'nu', 'wm', 'uj'] + + isEditing: -> + return this._id is Session.get('editingMessageId') getPupupConfig: -> template = Template.instance() diff --git a/client/views/app/chatMessageDashboard.html b/client/views/app/chatMessageDashboard.html index dc7cb4a86a0..b2c90ed02dc 100644 --- a/client/views/app/chatMessageDashboard.html +++ b/client/views/app/chatMessageDashboard.html @@ -1,10 +1,10 @@ <template name="chatMessageDashboard"> {{#if ../dateSeparator}} <li class="date"> - <span>{{messageDate ts}}</span> + <span>{{date}}</span> </li> {{/if}} - <li id="{{_id}}" class="message {{#if ../single}}sequential{{/if}} {{own}} {{type}}" data-username="{{u.username}}"> + <li id="{{_id}}" class="message {{#if ../single}}sequential{{/if}} {{own}} {{type}}" data-username="{{u.username}}" data-date="{{date}}"> {{#if isSystemMessage}} <p class="system">{{{message}}}</p> {{else}} -- GitLab