Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Some usability fixes around the toolbar and emojis

Browse Source
This commit is contained in:
JC Brand 2017-06-24 11:34:01 +02:00
parent 70f56b31f4
commit 4e467044d3
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/converse-chatview.js
View File

@ -703,15 +703,17 @@
} else { } else {
target = ev.target; target = ev.target;
} }
this.insertIntoTextArea( var shortname = target.getAttribute('data-emoticon');
emojione.shortnameToUnicode( this.insertIntoTextArea( emojione.shortnameToUnicode(shortname));
target.getAttribute('data-emoticon')
));
}, },
toggleEmoticonMenu: function (ev) { toggleEmoticonMenu: function (ev) {
if (!_.isUndefined(ev)) { if (!_.isUndefined(ev)) {
ev.stopPropagation(); ev.stopPropagation();
if (ev.target.classList.contains('emoji-category-picker') ||
ev.target.classList.contains('emoji-category')) {
return;
}
} }
utils.toggleElement(this.emoji_picker_view.el); utils.toggleElement(this.emoji_picker_view.el);
}, },

2
src/converse-muc.js
View File

@ -438,7 +438,7 @@
'click .close-chatbox-button': 'close', 'click .close-chatbox-button': 'close',
'click .configure-chatroom-button': 'getAndRenderConfigurationForm', 'click .configure-chatroom-button': 'getAndRenderConfigurationForm',
'click .toggle-smiley': 'toggleEmoticonMenu', 'click .toggle-smiley': 'toggleEmoticonMenu',
'click .toggle-smiley ul li': 'insertEmoticon', 'click .toggle-smiley ul.emoji-picker li': 'insertEmoticon',
'click .toggle-clear': 'clearChatRoomMessages', 'click .toggle-clear': 'clearChatRoomMessages',
'click .toggle-call': 'toggleCall', 'click .toggle-call': 'toggleCall',
'click .toggle-occupants a': 'toggleOccupants', 'click .toggle-occupants a': 'toggleOccupants',