From ed707db4ba23601329f1a11a3f94271f10bf20b8 Mon Sep 17 00:00:00 2001 From: lilia Date: Tue, 10 Mar 2015 18:12:40 -0700 Subject: [PATCH] Support :emoji_name: syntax for emoji text input --- js/views/conversation_view.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index 88c9d08a5..8490c501a 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -30,6 +30,8 @@ this.render(); + emoji.init_colons(); + this.fileInput = new Whisper.FileInputView({ el: this.$el.find('.attachments') }); @@ -133,7 +135,7 @@ sendMessage: function(e) { e.preventDefault(); var input = this.$el.find('.send input.send-message'); - var message = input.val(); + var message = this.replace_colons(input.val()); var convo = this.model; if (message.length > 0 || this.fileInput.hasFiles()) { @@ -143,6 +145,13 @@ input.val(""); this.fileInput.deleteFiles(); } + }, + replace_colons: function(str) { + return str.replace(emoji.rx_colons, function(m){ + var idx = m.substr(1, m.length-2); + var val = emoji.map.colons[idx]; + return emoji.data[val][0][0]; + }); } }); })();