Merge branch 'develop' into feat-1714
This commit is contained in:
commit
aab4fa9394
116 changed files with 6003 additions and 4791 deletions
|
|
@ -101,9 +101,11 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
|
|||
}
|
||||
|
||||
function reportAbuse() {
|
||||
os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
|
||||
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
|
||||
user: user,
|
||||
}, {}, 'closed');
|
||||
}, {
|
||||
closed: () => dispose(),
|
||||
});
|
||||
}
|
||||
|
||||
async function getConfirmed(text: string): Promise<boolean> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue