Allow to set messages as ungroupable

pull/1658/head
Rodrigo Nascimento 11 years ago
parent b2f18455cc
commit b64a720d99
  1. 1
      packages/rocketchat-integrations/server/api/api.coffee
  2. 12
      packages/rocketchat-ui-message/message/message.coffee
  3. 2
      packages/rocketchat-ui-message/message/message.html

@ -78,6 +78,7 @@ Api.addRoute ':integrationId/:userId/:token', authRequired: true,
parseUrls: false
bot:
i: integration._id
groupable: false
RocketChat.sendMessage user, message, room, {}

@ -1,6 +1,10 @@
Template.message.helpers
isBot: ->
return 'bot' if this.bot?
isGroupable: ->
return 'false' if this.groupable is false
isSequential: ->
return 'sequential' if this.groupable isnt false
own: ->
return 'own' if this.u?._id is Meteor.userId()
chatops: ->
@ -111,17 +115,19 @@ Template.message.onViewRendered = (context) ->
if lastNode.previousElementSibling?.dataset?.date isnt lastNode.dataset.date
$(lastNode).addClass('new-day')
$(lastNode).removeClass('sequential')
else if lastNode.previousElementSibling?.dataset?.bot is 'bot' or lastNode.previousElementSibling?.dataset?.username isnt lastNode.dataset.username
else if lastNode.previousElementSibling?.dataset?.username isnt lastNode.dataset.username
$(lastNode).removeClass('sequential')
if lastNode.previousElementSibling?.dataset?.groupable is 'false'
$(lastNode).removeClass('sequential')
if lastNode.nextElementSibling?.dataset?.date is lastNode.dataset.date
$(lastNode.nextElementSibling).removeClass('new-day')
$(lastNode.nextElementSibling).addClass('sequential')
else
$(lastNode.nextElementSibling).addClass('new-day')
$(lastNode.nextElementSibling).removeClass('sequential')
if lastNode.nextElementSibling?.dataset?.bot is 'bot' or lastNode.nextElementSibling?.dataset?.username isnt lastNode.dataset.username
if lastNode.nextElementSibling?.dataset?.username isnt lastNode.dataset.username
$(lastNode.nextElementSibling).removeClass('sequential')
if not lastNode.nextElementSibling?

@ -1,5 +1,5 @@
<template name="message">
<li id="{{_id}}" class="message sequential {{system}} {{t}} {{own}} {{isTemp}} {{chatops}}" data-username="{{u.username}}" data-bot="{{isBot}}" data-date="{{date}}">
<li id="{{_id}}" class="message {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}">
{{#if avatar}}
<a class="thumb user-card-message" href="#" data-username="{{u.username}}" tabindex="1">
<div class="avatar">

Loading…
Cancel
Save