diff --git a/CHANGES.md b/CHANGES.md
index 3d6ef6509..f7dd1f5d3 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,12 @@
## 3.2.0 (Unreleased)
+### New features
- Add support for Emojis (either native, or via Emojione).
+ Therefore the `visible_toolbar_buttons.emoticons` configuration option is now changed
+ to `visible_toolbar_buttons.emoji`. [jcbrand]
+
+### Code changes
- Removed jQuery from `converse-core`, `converse-vcard` and `converse-roomslist`. [jcbrand]
- Remove `jquery.easing` from the full build. Was only being used by the
[conversejs.org](https://conversejs.org) website, which has been updated to not rely on it. [jcbrand]
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
index 620b683c8..caecb47b8 100644
--- a/docs/source/configuration.rst
+++ b/docs/source/configuration.rst
@@ -1162,7 +1162,7 @@ visible_toolbar_buttons
{
call: false,
clear: true,
- emoticons: true,
+ emoji: true,
toggle_occupants: true
}
@@ -1181,9 +1181,9 @@ Allows you to show or hide buttons on the chat boxes' toolbars.
});
* *clear*:
Provides a button for clearing messages from a chat box.
-* *emoticons*:
- Enables rendering of emoticons and provides a toolbar button for choosing them.
-* toggle_occupants:
+* *emoji*:
+ Enables rendering of emoji and provides a toolbar button for choosing them.
+* *toggle_occupants*:
Shows a button for toggling (i.e. showing/hiding) the list of occupants in a chat room.
.. _`websocket-url`:
diff --git a/sass/_core.scss b/sass/_core.scss
index a9251e8f4..50fe9abc5 100644
--- a/sass/_core.scss
+++ b/sass/_core.scss
@@ -52,9 +52,6 @@
-webkit-touch-callout: none;
@include user-select(none);
}
- .emoticon {
- font-size: $font-size;
- }
@keyframes fadein {
0% { opacity: 0 }
diff --git a/src/converse-chatview.js b/src/converse-chatview.js
index 762eccb98..52003b424 100644
--- a/src/converse-chatview.js
+++ b/src/converse-chatview.js
@@ -93,7 +93,6 @@
time_format: 'HH:mm',
visible_toolbar_buttons: {
'emoji': true,
- 'emoticons': true,
'call': false,
'clear': true
},
@@ -422,8 +421,8 @@
'extra_classes': this.getExtraMessageClasses(attrs)
})
));
- if (_converse.visible_toolbar_buttons.emoticons) {
- text = utils.addEmoticons(_converse, emojione, text);
+ if (_converse.visible_toolbar_buttons.emoji) {
+ text = utils.addEmoji(_converse, emojione, text);
}
$msg.find('.chat-msg-content').first().text(text).addHyperlinks();
return $msg;
@@ -780,7 +779,6 @@
'label_start_call': __('Start a call'),
'show_call_button': _converse.visible_toolbar_buttons.call,
'show_clear_button': _converse.visible_toolbar_buttons.clear,
- 'show_emoticons': _converse.visible_toolbar_buttons.emoticons,
'use_emoji': _converse.visible_toolbar_buttons.emoji,
});
},
diff --git a/src/templates/chatroom_toolbar.html b/src/templates/chatroom_toolbar.html
index 6678f1532..8ec2cde9f 100644
--- a/src/templates/chatroom_toolbar.html
+++ b/src/templates/chatroom_toolbar.html
@@ -1,25 +1,6 @@
-{[ if (show_emoticons) { ]}
+{[ if (use_emoji) { ]}
- {[ if (use_emoji) { ]}
- {[ } ]}
- {[ if (!use_emoji) { ]}
-
- {[ } ]}
{[ } ]}
{[ if (show_call_button) { ]}
diff --git a/src/templates/toolbar.html b/src/templates/toolbar.html
index 0c32acae9..8515879bf 100644
--- a/src/templates/toolbar.html
+++ b/src/templates/toolbar.html
@@ -1,26 +1,7 @@
-{[ if (show_emoticons) { ]}
+{[ if (use_emoji) { ]}
- {[ if (use_emoji) { ]}
- {[ } ]}
- {[ if (!use_emoji) { ]}
-
- {[ } ]}
{[ } ]}
{[ if (show_call_button) { ]}
diff --git a/src/utils.js b/src/utils.js
index 0a291c134..f37ffbf7a 100755
--- a/src/utils.js
+++ b/src/utils.js
@@ -565,7 +565,7 @@
frag = tmp = null;
};
- utils.addEmoticons = function (_converse, emojione, text) {
+ utils.addEmoji = function (_converse, emojione, text) {
return emojione.shortnameToUnicode(text);
}