Some usability fixes around the toolbar and emojis

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);
                 },

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',