Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-03-02 15:56:30 +01:00
commit b2aad6b273
2 changed files with 5 additions and 0 deletions

View File

@ -4,6 +4,8 @@
- Avoid `eval` (via `_.template` from lodash).
- Don't show bookmark toggles when PEP bookmarking not supported by the XMPP server.
- Emojis are now sent in unicode instead of short names (also in MUCs)
### Bugfixes

View File

@ -13,6 +13,7 @@
define([
"form-utils",
"converse-core",
"emojione",
"lodash.fp",
"tpl!chatarea",
"tpl!chatroom",
@ -44,6 +45,7 @@
}(this, function (
u,
converse,
emojione,
fp,
tpl_chatarea,
tpl_chatroom,
@ -969,6 +971,7 @@
* Parameters:
* (String) text: The message text to be sent.
*/
text = emojione.shortnameToUnicode(text)
const msgid = _converse.connection.getUniqueId();
const msg = $msg({
to: this.model.get('jid'),