diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/emoji_input/emoji_input.js | 17 | ||||
| -rw-r--r-- | src/components/emoji_input/emoji_input.vue | 8 | ||||
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.js | 5 | ||||
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.vue | 2 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 8 |
5 files changed, 27 insertions, 13 deletions
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js index 6dc006f8..94af6e2f 100644 --- a/src/components/emoji_input/emoji_input.js +++ b/src/components/emoji_input/emoji_input.js @@ -54,17 +54,28 @@ const EmojiInput = { required: true, type: String }, - emojiPicker: { + enableEmojiPicker: { + /** + * Enables emoji picker support, this implies that custom emoji are supported + */ required: false, type: Boolean, default: false }, - emojiPickerExternalTrigger: { + hideEmojiButton: { + /** + enableStickerPicker: { + * intended to use with external picker trigger, i.e. you have a button outside + * input that will open up the picker, see triggerShowPicker() + */ required: false, type: Boolean, default: false }, - stickerPicker: { + enableStickerPicker: { + /** + * Enables sticker picker support, only makes sense when enableEmojiPicker=true + */ required: false, type: Boolean, default: false diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue index b077e6e9..53b38573 100644 --- a/src/components/emoji_input/emoji_input.vue +++ b/src/components/emoji_input/emoji_input.vue @@ -4,19 +4,19 @@ class="emoji-input" > <slot /> - <template v-if="emojiPicker"> + <template v-if="enableEmojiPicker"> <div - v-if="!emojiPickerExternalTrigger" + v-if="!hideEmojiButton" class="emoji-picker-icon" @click.prevent="togglePicker" > <i class="icon-smile" /> </div> <EmojiPicker - v-if="emojiPicker" + v-if="enableEmojiPicker" ref="picker" :class="{ hide: !showPicker }" - :sticker-picker="stickerPicker" + :enable-sticker-picker="enableStickerPicker" class="emoji-picker-panel" @emoji="insert" @sticker-uploaded="onStickerUploaded" diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index bce5026e..570ace13 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -5,7 +5,7 @@ const filterByKeyword = (list, keyword = '') => { const EmojiPicker = { props: { - stickerPicker: { + enableStickerPicker: { required: false, type: Boolean, default: false @@ -97,6 +97,9 @@ const EmojiPicker = { }, emojisView () { return this.emojis.filter(value => value.emojis.length > 0) + }, + stickerPickerEnabled () { + return (this.$store.state.instance.stickers || []).length !== 0 } } } diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue index 901520aa..5c139d0e 100644 --- a/src/components/emoji_picker/emoji_picker.vue +++ b/src/components/emoji_picker/emoji_picker.vue @@ -17,7 +17,7 @@ </span> </span> <span - v-if="stickerPicker" + v-if="stickerPickerEnabled" class="additional-tabs" > <span diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 026cb8fe..0e0b0e60 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -61,7 +61,7 @@ <EmojiInput v-if="newStatus.spoilerText || alwaysShowSubject" v-model="newStatus.spoilerText" - emoji-picker + enable-emoji-picker :suggest="emojiSuggestor" class="form-control" > @@ -78,9 +78,9 @@ v-model="newStatus.status" :suggest="emojiUserSuggestor" class="form-control main-input" - emoji-picker - emoji-picker-external-trigger - sticker-picker + enable-emoji-picker + hide-emoji-button + enable-sticker-picker @sticker-uploaded="addMediaFile" @sticker-upload-failed="uploadFailed" > |