Fix use emoji preference

pull/9182/head
Karl Prieb 8 years ago
parent 80c367b237
commit f3049de155
  1. 5
      packages/rocketchat-emoji/client/emojiButton.js
  2. 6
      packages/rocketchat-emoji/client/emojiPicker.css
  3. 2
      packages/rocketchat-ui-message/client/messageBox.html
  4. 3
      packages/rocketchat-ui-message/client/messageBox.js
  5. 4
      packages/rocketchat-ui-message/client/popup/messagePopupConfig.js

@ -3,6 +3,11 @@ Template.messageBox.events({
'click .emoji-picker-icon'(event) {
event.stopPropagation();
event.preventDefault();
if (!RocketChat.getUserPreference(Meteor.user(), 'useEmojis')) {
return false;
}
if (RocketChat.EmojiPicker.isOpened()) {
RocketChat.EmojiPicker.close();
} else {

@ -3,6 +3,12 @@
font-size: 18px;
&--disabled {
cursor: default;
color: var(--message-box-container-border-color);
}
&::before {
transition: transform 0.2s ease;
}

@ -22,7 +22,7 @@
{{#if allowedToSend}}
{{> messagePopupConfig getPopupConfig}}
<label class="rc-message-box__container">
<div class="rc-message-box__icon emoji-picker-icon">
<div class="rc-message-box__icon emoji-picker-icon {{#unless isEmojiEnable}}emoji-picker-icon--disabled{{/unless}}">
{{> icon block="rc-input__icon-svg" icon="emoji"}}
</div>
<textarea autofocus name="msg" maxlength="{{maxMessageLength}}" placeholder="{{_ 'Message'}}" rows="1" class="rc-message-box__textarea js-input-message autogrow-short"></textarea>

@ -266,6 +266,9 @@ Template.messageBox.helpers({
},
embeddedVersion() {
return RocketChat.Layout.isEmbedded();
},
isEmojiEnable() {
return RocketChat.getUserPreference(Meteor.user(), 'useEmojis');
}
});

@ -311,6 +311,10 @@ Template.messagePopupConfig.helpers({
getFilter(collection, filter) {
const key = `:${ filter }`;
if (!RocketChat.getUserPreference(Meteor.user(), 'useEmojis')) {
return [];
}
if (!RocketChat.emoji.packages.emojione || RocketChat.emoji.packages.emojione.asciiList[key]) {
return [];
}

Loading…
Cancel
Save