Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
1a518f3d
Commit
1a518f3d
authored
Mar 02, 2018
by
JC Brand
Committed by
GitHub
Mar 02, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1029 from ChaosKid42/send_emojis_as_unicode_muc
send emojis as unicode also in MUCs
parents
0a28e7aa
ca0bd1c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
CHANGES.md
CHANGES.md
+2
-0
src/converse-muc.js
src/converse-muc.js
+3
-0
No files found.
CHANGES.md
View file @
1a518f3d
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
-
Avoid
`eval`
(via
`_.template`
from lodash).
-
Avoid
`eval`
(via
`_.template`
from lodash).
-
Don't show bookmark toggles when PEP bookmarking not supported by the XMPP server.
-
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
### Bugfixes
...
...
src/converse-muc.js
View file @
1a518f3d
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
define
([
define
([
"
form-utils
"
,
"
form-utils
"
,
"
converse-core
"
,
"
converse-core
"
,
"
emojione
"
,
"
lodash.fp
"
,
"
lodash.fp
"
,
"
tpl!chatarea
"
,
"
tpl!chatarea
"
,
"
tpl!chatroom
"
,
"
tpl!chatroom
"
,
...
@@ -44,6 +45,7 @@
...
@@ -44,6 +45,7 @@
}(
this
,
function
(
}(
this
,
function
(
u
,
u
,
converse
,
converse
,
emojione
,
fp
,
fp
,
tpl_chatarea
,
tpl_chatarea
,
tpl_chatroom
,
tpl_chatroom
,
...
@@ -969,6 +971,7 @@
...
@@ -969,6 +971,7 @@
* Parameters:
* Parameters:
* (String) text: The message text to be sent.
* (String) text: The message text to be sent.
*/
*/
text
=
emojione
.
shortnameToUnicode
(
text
)
const
msgid
=
_converse
.
connection
.
getUniqueId
();
const
msgid
=
_converse
.
connection
.
getUniqueId
();
const
msg
=
$msg
({
const
msg
=
$msg
({
to
:
this
.
model
.
get
(
'
jid
'
),
to
:
this
.
model
.
get
(
'
jid
'
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment