Skip to content

Commit

Permalink
Merge branch 'master' into build
Browse files Browse the repository at this point in the history
  • Loading branch information
serebrov committed Mar 20, 2021
2 parents 7857e59 + 9764481 commit 23bd0f2
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emoji-mart-vue-fast",
"version": "9.0.0",
"version": "9.1.0",
"description": "Customizable Slack-like emoji picker for VueJS, fast version",
"main": "dist/emoji-mart.js",
"repository": {
Expand Down
8 changes: 4 additions & 4 deletions src/components/Picker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ import store from '../utils/store'
import frequently from '../utils/frequently'
import { deepMerge, measureScrollbar } from '../utils'
import { PickerProps } from '../utils/shared-props'
import Anchors from './anchors'
import Category from './category'
import Preview from './preview'
import Search from './search'
import Anchors from './anchors.vue'
import Category from './category.vue'
import Preview from './preview.vue'
import Search from './search.vue'
const I18N = {
search: 'Search',
Expand Down
8 changes: 4 additions & 4 deletions src/components/VirtualScrollPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ import store from '../utils/store'
import frequently from '../utils/frequently'
import { deepMerge, measureScrollbar } from '../utils'
import { PickerProps } from '../utils/shared-props'
import Anchors from './anchors'
import Category from './category'
import Preview from './preview'
import Search from './search'
import Anchors from './anchors.vue'
import Category from './category.vue'
import Preview from './preview.vue'
import Search from './search.vue'
/*
* Note about `buffer` setting for DynamicScroller: this is a
Expand Down
2 changes: 1 addition & 1 deletion src/components/category.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<script>
import { EmojiView } from '../utils/emoji-data'
import Emoji from './Emoji'
import Emoji from './Emoji.vue'
export default {
Expand Down
14 changes: 7 additions & 7 deletions src/components/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export { default as Anchors } from './anchors'
export { default as Category } from './category'
export { default as Preview } from './preview'
export { default as Search } from './search'
export { default as Skins } from './skins'
export { default as Emoji } from './Emoji'
export { default as Picker } from './Picker'
export { default as Anchors } from './anchors.vue'
export { default as Category } from './category.vue'
export { default as Preview } from './preview.vue'
export { default as Search } from './search.vue'
export { default as Skins } from './skins.vue'
export { default as Emoji } from './Emoji.vue'
export { default as Picker } from './Picker.vue'
4 changes: 2 additions & 2 deletions src/components/preview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@

<script>
import Emoji from './Emoji'
import Skins from './skins'
import Emoji from './Emoji.vue'
import Skins from './skins.vue'
export default {
props: {
Expand Down

0 comments on commit 23bd0f2

Please sign in to comment.