Skip to content

😍 Emoji picker vue #3994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 6 commits into from
Aug 5, 2020
Merged

😍 Emoji picker vue #3994

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
654ffe4
Adding Emoji picker component to message form
May 24, 2020
35f7d8f
EmojiPicker: use material icon instead of emoji
Jul 27, 2020
a470ea1
EmojiPicker: swap order of buttons in NewMessageForm
Jul 27, 2020
72b2ff2
Fix adding emojis to rich texts in Firefox
danxuliu Jul 29, 2020
0c638f3
Insert emojis at the current caret position
danxuliu Jul 29, 2020
b8f6222
Remove unneeded item
nickvergessen Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
EmojiPicker: use material icon instead of emoji 
Co-authored-by: Joas Schilling <[email protected]>
Signed-off-by: Simon Spannagel <[email protected]>
  • Loading branch information
@nickvergessen
Simon Spannagel and nickvergessen committed Aug 5, 2020
commit 35f7d8f4945fcdc4abfb98d3dd44260faa86e7c3
5 changes: 4 additions & 1 deletion src/components/NewMessageForm/NewMessageForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
class="new-message-form__icon new-message-form__button"
:aria-label="t('spreed', 'Add emoji')"
:aria-haspopup="true">
🙂
<EmoticonOutline
:size="20" />
</button>
</EmojiPicker>
</div>
Expand Down Expand Up @@ -101,6 +102,7 @@ import { shareFile } from '../../services/filesSharingServices'
import { processFiles } from '../../utils/fileUpload'
import { CONVERSATION } from '../../constants'
import createTemporaryMessage from '../../utils/temporaryMessage'
import EmoticonOutline from 'vue-material-design-icons/EmoticonOutline'

const picker = getFilePickerBuilder(t('spreed', 'File to share'))
.setMultiSelect(false)
Expand All @@ -117,6 +119,7 @@ export default {
Actions,
ActionButton,
EmojiPicker,
EmoticonOutline,
},
data: function() {
return {
Expand Down