diff options
Diffstat (limited to 'src/client/ui')
| -rw-r--r-- | src/client/ui/_common_/header.vue | 4 | ||||
| -rw-r--r-- | src/client/ui/_common_/sidebar.vue | 4 | ||||
| -rw-r--r-- | src/client/ui/chat/note.vue | 8 | ||||
| -rw-r--r-- | src/client/ui/chat/pages/channel.vue | 2 | ||||
| -rw-r--r-- | src/client/ui/chat/post-form.vue | 2 | ||||
| -rw-r--r-- | src/client/ui/default.header.vue | 4 | ||||
| -rw-r--r-- | src/client/ui/default.sidebar.vue | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/client/ui/_common_/header.vue b/src/client/ui/_common_/header.vue index 24b9046717..67bb3abb93 100644 --- a/src/client/ui/_common_/header.vue +++ b/src/client/ui/_common_/header.vue @@ -31,7 +31,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import { modalMenu } from '@client/os'; +import { popupMenu } from '@client/os'; import { url } from '@client/config'; export default defineComponent({ @@ -121,7 +121,7 @@ export default defineComponent({ if (menu.length > 0) menu.push(null); menu = menu.concat(this.menu); } - modalMenu(menu, ev.currentTarget || ev.target); + popupMenu(menu, ev.currentTarget || ev.target); } } }); diff --git a/src/client/ui/_common_/sidebar.vue b/src/client/ui/_common_/sidebar.vue index 073907cde9..ffa3a67b13 100644 --- a/src/client/ui/_common_/sidebar.vue +++ b/src/client/ui/_common_/sidebar.vue @@ -150,7 +150,7 @@ export default defineComponent({ }); })); - os.modalMenu([...[{ + os.popupMenu([...[{ type: 'link', text: this.$ts.profile, to: `/@${ this.$i.username }`, @@ -159,7 +159,7 @@ export default defineComponent({ icon: 'fas fa-plus', text: this.$ts.addAccount, action: () => { - os.modalMenu([{ + os.popupMenu([{ text: this.$ts.existingAccount, action: () => { this.addAccount(); }, }, { diff --git a/src/client/ui/chat/note.vue b/src/client/ui/chat/note.vue index 7a525d9edb..6d2b9bbf54 100644 --- a/src/client/ui/chat/note.vue +++ b/src/client/ui/chat/note.vue @@ -432,7 +432,7 @@ export default defineComponent({ pleaseLogin(); this.operating = true; this.blur(); - os.modalMenu([{ + os.popupMenu([{ text: this.$ts.renote, icon: 'fas fa-retweet', action: () => { @@ -726,7 +726,7 @@ export default defineComponent({ menu(viaKeyboard = false) { this.operating = true; - os.modalMenu(this.getMenu(), this.$refs.menuButton, { + os.popupMenu(this.getMenu(), this.$refs.menuButton, { viaKeyboard }).then(() => { this.operating = false; @@ -736,7 +736,7 @@ export default defineComponent({ showRenoteMenu(viaKeyboard = false) { if (!this.isMyRenote) return; - os.modalMenu([{ + os.popupMenu([{ text: this.$ts.unrenote, icon: 'fas fa-trash-alt', danger: true, @@ -780,7 +780,7 @@ export default defineComponent({ async clip() { const clips = await os.api('clips/list'); - os.modalMenu([{ + os.popupMenu([{ icon: 'fas fa-plus', text: this.$ts.createNew, action: async () => { diff --git a/src/client/ui/chat/pages/channel.vue b/src/client/ui/chat/pages/channel.vue index 76b334487e..d11d40b210 100644 --- a/src/client/ui/chat/pages/channel.vue +++ b/src/client/ui/chat/pages/channel.vue @@ -178,7 +178,7 @@ export default defineComponent({ }, openChannelMenu(ev) { - os.modalMenu([{ + os.popupMenu([{ text: this.$ts.copyUrl, icon: 'fas fa-link', action: () => { diff --git a/src/client/ui/chat/post-form.vue b/src/client/ui/chat/post-form.vue index 6812eb31ba..0f9a206fab 100644 --- a/src/client/ui/chat/post-form.vue +++ b/src/client/ui/chat/post-form.vue @@ -594,7 +594,7 @@ export default defineComponent({ }, showActions(ev) { - os.modalMenu(postFormActions.map(action => ({ + os.popupMenu(postFormActions.map(action => ({ text: action.title, action: () => { action.handler({ diff --git a/src/client/ui/default.header.vue b/src/client/ui/default.header.vue index a67883020f..df2e99f13a 100644 --- a/src/client/ui/default.header.vue +++ b/src/client/ui/default.header.vue @@ -116,7 +116,7 @@ export default defineComponent({ }); })); - os.modalMenu([...[{ + os.popupMenu([...[{ type: 'link', text: this.$ts.profile, to: `/@${ this.$i.username }`, @@ -125,7 +125,7 @@ export default defineComponent({ icon: 'fas fa-plus', text: this.$ts.addAccount, action: () => { - os.modalMenu([{ + os.popupMenu([{ text: this.$ts.existingAccount, action: () => { this.addAccount(); }, }, { diff --git a/src/client/ui/default.sidebar.vue b/src/client/ui/default.sidebar.vue index 2e0336878d..dd6d4d1516 100644 --- a/src/client/ui/default.sidebar.vue +++ b/src/client/ui/default.sidebar.vue @@ -136,7 +136,7 @@ export default defineComponent({ }); })); - os.modalMenu([...[{ + os.popupMenu([...[{ type: 'link', text: this.$ts.profile, to: `/@${ this.$i.username }`, @@ -145,7 +145,7 @@ export default defineComponent({ icon: 'fas fa-plus', text: this.$ts.addAccount, action: () => { - os.modalMenu([{ + os.popupMenu([{ text: this.$ts.existingAccount, action: () => { this.addAccount(); }, }, { |