diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-09-29 10:18:37 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-09-29 10:18:37 +0000 |
| commit | 91778a02766602b81ec8737282495aa4b5294d19 (patch) | |
| tree | da6bb6092acfb50b441f3afb5c4cc792e0b2b3a4 /src/components/react_button | |
| parent | 3781e521e64a59c4e38902601555ae01f99d9fce (diff) | |
| parent | f174f289a93e6bef1182a2face00bb809da49d18 (diff) | |
Merge branch 'feat/custom-virtual-scrolling' into 'develop'
Timeline virtual scrolling
See merge request pleroma/pleroma-fe!1043
Diffstat (limited to 'src/components/react_button')
| -rw-r--r-- | src/components/react_button/react_button.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js index abcf0455..11627e9c 100644 --- a/src/components/react_button/react_button.js +++ b/src/components/react_button/react_button.js @@ -1,5 +1,4 @@ import Popover from '../popover/popover.vue' -import { mapGetters } from 'vuex' const ReactButton = { props: ['status'], @@ -35,7 +34,9 @@ const ReactButton = { } return this.$store.state.instance.emoji || [] }, - ...mapGetters(['mergedConfig']) + mergedConfig () { + return this.$store.getters.mergedConfig + } } } |