Compare commits
No commits in common. "118c1fae5e9a4641ef96d0637623958808e8fa5b" and "9f4e1d5363287bf41d2e38c99e10e6261e6c7972" have entirely different histories.
118c1fae5e
...
9f4e1d5363
9 changed files with 14 additions and 3 deletions
|
|
@ -144,6 +144,7 @@ const Notification = {
|
|||
}
|
||||
},
|
||||
doApprove() {
|
||||
this.$emit('interacted')
|
||||
this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
|
||||
this.$store.dispatch('removeFollowRequest', this.user)
|
||||
this.$store.dispatch('markSingleNotificationAsSeen', {
|
||||
|
|
@ -165,6 +166,7 @@ const Notification = {
|
|||
}
|
||||
},
|
||||
doDeny() {
|
||||
this.$emit('interacted')
|
||||
this.$store.state.api.backendInteractor
|
||||
.denyUser({ id: this.user.id })
|
||||
.then(() => {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
class="Notification"
|
||||
:compact="true"
|
||||
:statusoid="notification.status"
|
||||
@click="interacted"
|
||||
@interacted="interacted"
|
||||
/>
|
||||
</article>
|
||||
<article
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ const Status = {
|
|||
'controlledMediaPlaying',
|
||||
'controlledSetMediaPlaying',
|
||||
],
|
||||
emits: ['goto', 'toggleExpanded'],
|
||||
emits: ['interacted', 'goto', 'toggleExpanded'],
|
||||
data() {
|
||||
return {
|
||||
uncontrolledReplying: false,
|
||||
|
|
@ -560,9 +560,11 @@ const Status = {
|
|||
this.error = error
|
||||
},
|
||||
clearError() {
|
||||
this.$emit('interacted')
|
||||
this.error = undefined
|
||||
},
|
||||
toggleReplying() {
|
||||
this.$emit('interacted')
|
||||
if (this.replying) {
|
||||
this.$refs.postStatusForm.requestClose()
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -520,6 +520,7 @@
|
|||
:status="status"
|
||||
:replying="replying"
|
||||
@toggle-replying="toggleReplying"
|
||||
@interacted="e => $emit('interacted')"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ export default {
|
|||
'doAction',
|
||||
'outerClose',
|
||||
],
|
||||
emits: ['interacted'],
|
||||
components: {
|
||||
StatusBookmarkFolderMenu,
|
||||
EmojiPicker,
|
||||
|
|
@ -137,6 +138,7 @@ export default {
|
|||
this.button.interactive ? !this.button.interactive(this.funcArg) : false
|
||||
)
|
||||
return
|
||||
this.$emit('interacted')
|
||||
if (button.name === 'emoji') {
|
||||
this.$refs.picker.showPicker()
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ export default {
|
|||
UserTimedFilterModal,
|
||||
},
|
||||
props: ['button', 'status'],
|
||||
emits: ['interacted'],
|
||||
mounted() {
|
||||
if (this.button.name === 'mute') {
|
||||
this.$store.dispatch('fetchDomainMutes')
|
||||
|
|
|
|||
|
|
@ -79,6 +79,7 @@
|
|||
:button="button"
|
||||
:status="status"
|
||||
v-bind="$attrs"
|
||||
@interacted="e => $emit('interacted')"
|
||||
/>
|
||||
<teleport to="#modal">
|
||||
<MuteConfirm
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ library.add(faEllipsisH)
|
|||
|
||||
const StatusActionButtons = {
|
||||
props: ['status', 'replying'],
|
||||
emits: ['toggleReplying'],
|
||||
emits: ['toggleReplying', 'interacted'],
|
||||
data() {
|
||||
return {
|
||||
showPin: false,
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
:get-component="getComponent"
|
||||
:close="() => { /* no-op */ }"
|
||||
:do-action="doAction"
|
||||
@interacted="e => $emit('interacted')"
|
||||
/>
|
||||
<button
|
||||
v-if="showPin && currentUser"
|
||||
|
|
@ -74,6 +75,7 @@
|
|||
:get-component="getComponent"
|
||||
:outer-close="close"
|
||||
:do-action="doAction"
|
||||
@interacted="e => $emit('interacted')"
|
||||
/>
|
||||
<button
|
||||
v-if="showPin && currentUser"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue