Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Emoticons should be rendered with message template

Signed-off-by: Akash Manohar J <akash@akash.im>
  • Loading branch information...
commit bc69ef5b41fc4a58b4dabb03bac3caef20103178 1 parent 6290306
@HashNuke HashNuke authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  app/assets/javascripts/backbone/plugins/emoticons.js.coffee
View
2  app/assets/javascripts/backbone/plugins/emoticons.js.coffee
@@ -44,6 +44,6 @@ class Kandan.Plugins.Emoticons
replacement = @options.template({ emoticon: emoticon, title: title})
message.content = message.content.replace(search, replacement) if emoticon
console.log(message.content)
- return Kandan.Helpers.Activities.buildFromBaseTemplate(message)
+ return Kandan.Helpers.Activities.buildFromMessageTemplate(message)
# Kandan.Plugins.register "Kandan.Plugins.Emoticons"
Please sign in to comment.
Something went wrong with that request. Please try again.