File tree Expand file tree Collapse file tree 3 files changed +13
-4
lines changed Expand file tree Collapse file tree 3 files changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -242,6 +242,8 @@ fetchMessages({ room, options }) {
242
242
| ` link-options ` (16) | Object | - | ` { disabled: false, target: '_blank', rel: null } ` |
243
243
| ` room-info-enabled ` (17) | Boolean | - | ` false ` |
244
244
| ` textarea-action-enabled ` (18) | Boolean | - | ` false ` |
245
+ | ` user-tags-enabled ` | Boolean | - | ` true ` |
246
+ | ` emojis-suggestion-enabled ` | Boolean | - | ` true ` |
245
247
| ` responsive-breakpoint ` (19) | Number | - | ` 900 ` |
246
248
| ` single-room ` (20) | Boolean | - | ` false ` |
247
249
| ` scroll-distance ` (21) | Number | - | ` 60 ` |
Original file line number Diff line number Diff line change 56
56
:loading-rooms =" loadingRooms"
57
57
:room-info-enabled =" roomInfoEnabled"
58
58
:textarea-action-enabled =" textareaActionEnabled"
59
+ :user-tags-enabled =" userTagsEnabled"
60
+ :emojis-suggestion-enabled =" emojisSuggestionEnabled"
59
61
:scroll-distance =" scrollDistance"
60
62
:accepted-files =" acceptedFiles"
61
63
:templates-text =" templatesText"
@@ -155,6 +157,8 @@ export default {
155
157
},
156
158
roomInfoEnabled: { type: Boolean , default: false },
157
159
textareaActionEnabled: { type: Boolean , default: false },
160
+ userTagsEnabled: { type: Boolean , default: true },
161
+ emojisSuggestionEnabled: { type: Boolean , default: true },
158
162
roomMessage: { type: String , default: ' ' },
159
163
scrollDistance: { type: Number , default: 60 },
160
164
acceptedFiles: { type: String , default: ' *' },
Original file line number Diff line number Diff line change @@ -379,6 +379,8 @@ export default {
379
379
loadingRooms: { type: Boolean , required: true },
380
380
roomInfoEnabled: { type: Boolean , required: true },
381
381
textareaActionEnabled: { type: Boolean , required: true },
382
+ userTagsEnabled: { type: Boolean , required: true },
383
+ emojisSuggestionEnabled: { type: Boolean , required: true },
382
384
scrollDistance: { type: Number , required: true },
383
385
templatesText: { type: Array , default: null }
384
386
},
@@ -720,10 +722,11 @@ export default {
720
722
updateFooterList (tagChar ) {
721
723
if (! this .getTextareaRef ()) return
722
724
723
- if (
724
- tagChar === ' @' &&
725
- (! this .room .users || this .room .users .length <= 2 )
726
- ) {
725
+ if (tagChar === ' :' && ! this .emojisSuggestionEnabled ) {
726
+ return
727
+ }
728
+
729
+ if (tagChar === ' @' && (! this .userTagsEnabled || ! this .room .users )) {
727
730
return
728
731
}
729
732
You can’t perform that action at this time.
0 commit comments