Merge branch 'tusooa/983-mention-twice' into 'develop'
Fix a bug where mentioning a user twice will not fill the mention into the textarea Closes #983 See merge request pleroma/pleroma-fe!1850
This commit is contained in:
commit
a1641193b5
|
@ -0,0 +1 @@
|
||||||
|
Fix a bug where mentioning a user twice will not fill the mention into the textarea
|
|
@ -44,6 +44,10 @@ const PostStatusModal = {
|
||||||
methods: {
|
methods: {
|
||||||
closeModal () {
|
closeModal () {
|
||||||
this.$store.dispatch('closePostStatusModal')
|
this.$store.dispatch('closePostStatusModal')
|
||||||
|
},
|
||||||
|
resetAndClose () {
|
||||||
|
this.$store.dispatch('resetPostStatusModal')
|
||||||
|
this.$store.dispatch('closePostStatusModal')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<PostStatusForm
|
<PostStatusForm
|
||||||
class="panel-body"
|
class="panel-body"
|
||||||
v-bind="params"
|
v-bind="params"
|
||||||
@posted="closeModal"
|
@posted="resetAndClose"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</Modal>
|
</Modal>
|
||||||
|
|
|
@ -10,6 +10,9 @@ const postStatus = {
|
||||||
},
|
},
|
||||||
closePostStatusModal (state) {
|
closePostStatusModal (state) {
|
||||||
state.modalActivated = false
|
state.modalActivated = false
|
||||||
|
},
|
||||||
|
resetPostStatusModal (state) {
|
||||||
|
state.params = null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
|
@ -18,6 +21,9 @@ const postStatus = {
|
||||||
},
|
},
|
||||||
closePostStatusModal ({ commit }) {
|
closePostStatusModal ({ commit }) {
|
||||||
commit('closePostStatusModal')
|
commit('closePostStatusModal')
|
||||||
|
},
|
||||||
|
resetPostStatusModal ({ commit }) {
|
||||||
|
commit('resetPostStatusModal')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue