Merge pull request #9182 from RocketChat/fix-use-emoji

[FIX] "Use Emoji" preference not working
RocketChat · Dec 19, 2017 · 7864f4e · 7864f4e
2 parents af61edc + f3049de
commit 7864f4e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/packages/rocketchat-emoji/client/emojiButton.js b/packages/rocketchat-emoji/client/emojiButton.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 {

diff --git a/packages/rocketchat-emoji/client/emojiPicker.css b/packages/rocketchat-emoji/client/emojiPicker.css
@@ -3,6 +3,12 @@
 
 	font-size: 18px;
 
+	&--disabled {
+		cursor: default;
+
+		color: var(--message-box-container-border-color);
+	}
+
 	&::before {
 		transition: transform 0.2s ease;
 	}

diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
@@ -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>

diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
@@ -266,6 +266,9 @@ Template.messageBox.helpers({
 	},
 	embeddedVersion() {
 		return RocketChat.Layout.isEmbedded();
+	},
+	isEmojiEnable() {
+		return RocketChat.getUserPreference(Meteor.user(), 'useEmojis');
 	}
 });
 

diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
@@ -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 [];
 					}