Skip to content

Commit

Permalink
Merge pull request #12306 from nextcloud/backport/12285/stable29
Browse files Browse the repository at this point in the history
[stable29] fix: replace emoji-mart-vue-fast lib usage with nextcloud/vue function
  • Loading branch information
DorraJaouad authored May 8, 2024
2 parents bc82ad2 + 21f4c7c commit 3beecfe
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
1 change: 0 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"@nextcloud/vue": "^8.11.3",
"crypto-js": "^4.2.0",
"debounce": "^2.0.0",
"emoji-mart-vue-fast": "^15.0.2",
"emoji-regex": "^10.3.0",
"escape-html": "^1.0.3",
"extendable-media-recorder": "^9.1.15",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,6 @@
</template>

<script>
import { frequently, EmojiIndex as EmojiIndexFactory } from 'emoji-mart-vue-fast'
import data from 'emoji-mart-vue-fast/data/all.json'
import AccountIcon from 'vue-material-design-icons/Account.vue'
import AlarmIcon from 'vue-material-design-icons/Alarm.vue'
import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
Expand Down Expand Up @@ -301,6 +298,7 @@ import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator.
import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
import { emojiSearch } from '@nextcloud/vue/dist/Functions/emoji.js'
import { PARTICIPANT, CONVERSATION, ATTENDEE } from '../../../../../constants.js'
import { getMessageReminder, removeMessageReminder, setMessageReminder } from '../../../../../services/remindersService.js'
Expand All @@ -309,7 +307,6 @@ import { useReactionsStore } from '../../../../../stores/reactions.js'
import { copyConversationLinkToClipboard } from '../../../../../utils/handleUrl.ts'
import { parseMentions } from '../../../../../utils/textParse.ts'
const EmojiIndex = new EmojiIndexFactory(data)
const supportReminders = getCapabilities()?.spreed?.features?.includes('remind-me-later')
const canEditMessage = getCapabilities()?.spreed?.features?.includes('edit-messages')
const canDeleteMessageUnlimited = getCapabilities()?.spreed?.features?.includes('delete-messages-unlimited')
Expand Down Expand Up @@ -812,9 +809,7 @@ export default {
},
updateFrequentlyUsedEmojis() {
this.frequentlyUsedEmojis = frequently.get(5).map(emojiStrings => {
return EmojiIndex.emoji(emojiStrings).native
})
this.frequentlyUsedEmojis = emojiSearch('', 5).map(emoji => emoji.native)
},
getTimestamp(momentObject) {
Expand Down

0 comments on commit 3beecfe

Please sign in to comment.