IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Solve remaind merge conflict

Browse Source
This commit is contained in:
Wolfgang Huß 2019-06-20 11:26:51 +02:00
parent 42942e4777
commit c5f2d7cc78
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webapp/components/Editor/index.vue
View File

@ -187,11 +187,8 @@ import {
History,
} from 'tiptap-extensions'
import Mention from './nodes/Mention.js'
<<<<<<< HEAD
import Tag from './nodes/Tag.js'
=======
import { mapGetters } from 'vuex'
>>>>>>> origin/master
let throttleInputEvent
@ -386,17 +383,12 @@ export default {
}
},
computed: {
<<<<<<< HEAD
...mapGetters({ placeholder: 'editor/placeholder' }),
usersFilterHasResults() {
return this.filteredUsers.length > 0
},
tagsFilterHasResults() {
return this.filteredTags.length > 0
=======
...mapGetters({ placeholder: 'editor/placeholder' }),
hasResults() {
return this.filteredUsers.length
>>>>>>> origin/master
},
showSuggestions() {
return this.query || this.usersFilterHasResults || this.tagsFilterHasResults