From 4e467044d3c080cee0dc274e56ead2276d389ecf Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sat, 24 Jun 2017 11:34:01 +0200 Subject: [PATCH] Some usability fixes around the toolbar and emojis --- src/converse-chatview.js | 10 ++++++---- src/converse-muc.js | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/converse-chatview.js b/src/converse-chatview.js index fff0d8213..aa6146b5b 100644 --- a/src/converse-chatview.js +++ b/src/converse-chatview.js @@ -703,15 +703,17 @@ } else { target = ev.target; } - this.insertIntoTextArea( - emojione.shortnameToUnicode( - target.getAttribute('data-emoticon') - )); + var shortname = target.getAttribute('data-emoticon'); + this.insertIntoTextArea( emojione.shortnameToUnicode(shortname)); }, toggleEmoticonMenu: function (ev) { if (!_.isUndefined(ev)) { ev.stopPropagation(); + if (ev.target.classList.contains('emoji-category-picker') || + ev.target.classList.contains('emoji-category')) { + return; + } } utils.toggleElement(this.emoji_picker_view.el); }, diff --git a/src/converse-muc.js b/src/converse-muc.js index e608d856f..4be0da053 100755 --- a/src/converse-muc.js +++ b/src/converse-muc.js @@ -438,7 +438,7 @@ 'click .close-chatbox-button': 'close', 'click .configure-chatroom-button': 'getAndRenderConfigurationForm', 'click .toggle-smiley': 'toggleEmoticonMenu', - 'click .toggle-smiley ul li': 'insertEmoticon', + 'click .toggle-smiley ul.emoji-picker li': 'insertEmoticon', 'click .toggle-clear': 'clearChatRoomMessages', 'click .toggle-call': 'toggleCall', 'click .toggle-occupants a': 'toggleOccupants',