Merge pull request 'Final fixes before release' (#3507) from final-releasefixes into develop
Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3507
This commit is contained in:
commit
39d77c6ff9
5 changed files with 6 additions and 6 deletions
0
changelog.d/release-fixes.skip
Normal file
0
changelog.d/release-fixes.skip
Normal file
|
|
@ -9,6 +9,7 @@ import {
|
||||||
highlightStyle,
|
highlightStyle,
|
||||||
} from '../../services/user_highlighter/user_highlighter.js'
|
} from '../../services/user_highlighter/user_highlighter.js'
|
||||||
|
|
||||||
|
import { useInstanceStore } from 'src/stores/instance.js'
|
||||||
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
||||||
import { useUserHighlightStore } from 'src/stores/user_highlight.js'
|
import { useUserHighlightStore } from 'src/stores/user_highlight.js'
|
||||||
|
|
||||||
|
|
@ -89,8 +90,7 @@ const MentionLink = {
|
||||||
// XXX assumed that domain does not contain @
|
// XXX assumed that domain does not contain @
|
||||||
return (
|
return (
|
||||||
this.user &&
|
this.user &&
|
||||||
(this.userNameFullUi.split('@')[1] ||
|
(this.userNameFullUi.split('@')[1] || useInstanceStore().instanceDomain)
|
||||||
this.$store.getters.instanceDomain)
|
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
userNameFull() {
|
userNameFull() {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
ref="root"
|
ref="root"
|
||||||
>
|
>
|
||||||
<Status
|
<Status
|
||||||
class="Notification"
|
class="Notification panel-body"
|
||||||
:compact="true"
|
:compact="true"
|
||||||
:statusoid="notification.status"
|
:statusoid="notification.status"
|
||||||
@click="interacted"
|
@click="interacted"
|
||||||
|
|
|
||||||
|
|
@ -104,8 +104,8 @@ const StatusActionButtons = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
doActionReal(button) {
|
doActionReal(button) {
|
||||||
button
|
const promise = button.action?.(this.funcArg) ?? Promise.resolve()
|
||||||
.action?.(this.funcArg)
|
promise
|
||||||
.then(() => this.$emit('onSuccess'))
|
.then(() => this.$emit('onSuccess'))
|
||||||
.catch((err) => this.$emit('onError', err))
|
.catch((err) => this.$emit('onError', err))
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ export default {
|
||||||
this.onSwitch.call(null, this.slots()[index].key)
|
this.onSwitch.call(null, this.slots()[index].key)
|
||||||
}
|
}
|
||||||
this.active = index
|
this.active = index
|
||||||
if (this.scrollableTabs) {
|
if (this.scrollableTabs && this.$refs.contents) {
|
||||||
this.$refs.contents.scrollTop = 0
|
this.$refs.contents.scrollTop = 0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue