Commit e3d2abf0 authored by JC Brand's avatar JC Brand

emoji: Make sure emojis are also rendered for ascii emoticons

parent 49f26d8e
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
}, },
}); });
emojione.imagePathPNG = _converse.emojione_image_path; emojione.imagePathPNG = _converse.emojione_image_path;
emojione.ascii = true;
function onWindowStateChanged (data) { function onWindowStateChanged (data) {
_converse.chatboxviews.each(function (chatboxview) { _converse.chatboxviews.each(function (chatboxview) {
......
...@@ -1535,8 +1535,12 @@ ...@@ -1535,8 +1535,12 @@
}, },
registerMessageHandler () { registerMessageHandler () {
_converse.connection.addHandler(this.onMessage.bind(this), null, 'message', 'chat'); _converse.connection.addHandler(
_converse.connection.addHandler(this.onErrorMessage.bind(this), null, 'message', 'error'); this.onMessage.bind(this), null, 'message', 'chat'
);
_converse.connection.addHandler(
this.onErrorMessage.bind(this), null, 'message', 'error'
);
}, },
chatBoxMayBeShown (chatbox) { chatBoxMayBeShown (chatbox) {
...@@ -1588,7 +1592,6 @@ ...@@ -1588,7 +1592,6 @@
/* Handler method for all incoming single-user chat "message" /* Handler method for all incoming single-user chat "message"
* stanzas. * stanzas.
*/ */
let contact_jid, delay, resource, let contact_jid, delay, resource,
from_jid = message.getAttribute('from'), from_jid = message.getAttribute('from'),
to_jid = message.getAttribute('to'); to_jid = message.getAttribute('to');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment