wip

src/client/pages/index.welcome.entrance.vue

@@ -54,13 +54,13 @@ export default defineComponent({
 
 	methods: {
 		signin() {
-			this.$root.new(XSigninDialog, {
+			os.popup(XSigninDialog, {
 				autoSet: true
 			});
 		},
 
 		signup() {
-			this.$root.new(XSignupDialog, {
+			os.popup(XSignupDialog, {
 				autoSet: true
 			});
 		}

src/client/pages/instance/federation.vue

@@ -125,7 +125,7 @@ export default defineComponent({
 		},
 
 		info(instance) {
-			this.$root.new(MkInstanceInfo, {
+			os.popup(MkInstanceInfo, {
 				instance: instance
 			});
 		}

src/client/pages/instance/index.vue

@@ -550,7 +550,7 @@ export default defineComponent({
 					host: q
 				});
 			}
-			this.$root.new(MkInstanceInfo, {
+			os.popup(MkInstanceInfo, {
 				instance: instance
 			});
 		},

src/client/pages/instance/instance.vue

@@ -439,7 +439,7 @@ export default defineComponent({
 		},
 
 		showFollowing() {
-			this.$root.new(MkUsersDialog, {
+			os.popup(MkUsersDialog, {
 				title: this.$t('instanceFollowing'),
 				pagination: {
 					endpoint: 'federation/following',
@@ -453,7 +453,7 @@ export default defineComponent({
 		},
 
 		showFollowers() {
-			this.$root.new(MkUsersDialog, {
+			os.popup(MkUsersDialog, {
 				title: this.$t('instanceFollowers'),
 				pagination: {
 					endpoint: 'federation/followers',
@@ -467,7 +467,7 @@ export default defineComponent({
 		},
 
 		showUsers() {
-			this.$root.new(MkUsersDialog, {
+			os.popup(MkUsersDialog, {
 				title: this.$t('instanceUsers'),
 				pagination: {
 					endpoint: 'federation/users',

src/client/pages/instance/settings.vue

@@ -452,7 +452,7 @@ export default defineComponent({
 		},
 
 		addPinUser() {
-			this.$root.new(MkUserSelect, {}).$once('selected', user => {
+			os.popup(MkUserSelect, {}).$once('selected', user => {
 				this.pinnedUsers = this.pinnedUsers.trim();
 				this.pinnedUsers += '\n@' + getAcct(user);
 				this.pinnedUsers = this.pinnedUsers.trim();
@@ -460,7 +460,7 @@ export default defineComponent({
 		},
 
 		chooseProxyAccount() {
-			this.$root.new(MkUserSelect, {}).$once('selected', user => {
+			os.popup(MkUserSelect, {}).$once('selected', user => {
 				this.proxyAccount = user;
 				this.proxyAccountId = user.id;
 				this.save(true);

src/client/pages/instance/users.vue

@@ -180,7 +180,7 @@ export default defineComponent({
 		},
 
 		searchUser() {
-			this.$root.new(MkUserSelect, {}).$once('selected', user => {
+			os.popup(MkUserSelect, {}).$once('selected', user => {
 				this.show(user);
 			});
 		},

src/client/pages/messaging/index.vue

@@ -132,7 +132,7 @@ export default defineComponent({
 		},
 
 		async startUser() {
-			this.$root.new(MkUserSelect, {}).$once('selected', user => {
+			os.popup(MkUserSelect, {}).$once('selected', user => {
 				this.$router.push(`/my/messaging/${getAcct(user)}`);
 			});
 		},

src/client/pages/messaging/messaging-room.form.vue

@@ -220,7 +220,7 @@ export default defineComponent({
 		},
 
 		async insertEmoji(ev) {
-			const vm = this.$root.new(await import('@/components/emoji-picker.vue'), {
+			const vm = os.popup(await import('@/components/emoji-picker.vue'), {
 				source: ev.currentTarget || ev.target
 			}).$once('chosen', emoji => {
 				insertTextAtCursor(this.$refs.text, emoji);

src/client/pages/my-antennas/index.antenna.vue

@@ -177,7 +177,7 @@ export default defineComponent({
 		},
 
 		addUser() {
-			this.$root.new(MkUserSelect, {}).$once('selected', user => {
+			os.popup(MkUserSelect, {}).$once('selected', user => {
 				this.users = this.users.trim();
 				this.users += '\n@' + getAcct(user);
 				this.users = this.users.trim();

src/client/pages/my-groups/group.vue

@@ -89,7 +89,7 @@ export default defineComponent({
 		},
 
 		invite() {
-			this.$root.new(MkUserSelect, {}).$once('selected', user => {
+			os.popup(MkUserSelect, {}).$once('selected', user => {
 				os.api('users/groups/invite', {
 					groupId: this.group.id,
 					userId: user.id
@@ -134,7 +134,7 @@ export default defineComponent({
 		},
 
 		transfer() {
-			this.$root.new(MkUserSelect, {}).$once('selected', user => {
+			os.popup(MkUserSelect, {}).$once('selected', user => {
 				os.api('users/groups/transfer', {
 					groupId: this.group.id,
 					userId: user.id

src/client/pages/my-lists/list.vue

@@ -88,7 +88,7 @@ export default defineComponent({
 		},
 
 		addUser() {
-			this.$root.new(MkUserSelect, {}).$once('selected', user => {
+			os.popup(MkUserSelect, {}).$once('selected', user => {
 				os.api('users/lists/push', {
 					listId: this.list.id,
 					userId: user.id

src/client/pages/my-settings/api.vue

@@ -26,7 +26,7 @@ export default defineComponent({
 	},
 	methods: {
 		async generateToken() {
-			this.$root.new(await import('@/components/token-generate-window.vue'), {
+			os.popup(await import('@/components/token-generate-window.vue'), {
 			}).$on('ok', async ({ name, permissions }) => {
 				const { token } = await os.api('miauth/gen-token', {
 					session: null,

src/client/pages/my-settings/index.vue

@@ -114,7 +114,7 @@ export default defineComponent({
 		},
 
 		async configure() {
-			this.$root.new(await import('@/components/notification-setting-window.vue'), {
+			os.popup(await import('@/components/notification-setting-window.vue'), {
 				includingTypes: this.$store.state.i.includingNotificationTypes,
 				showGlobalToggle: false,
 			}).$on('ok', async ({ includingTypes: value }: any) => {

src/client/pages/my-settings/reaction.vue

@@ -58,7 +58,7 @@ export default defineComponent({
 		},
 
 		preview(ev) {
-			const picker = this.$root.new(MkReactionPicker, {
+			const picker = os.popup(MkReactionPicker, {
 				source: ev.currentTarget || ev.target,
 				reactions: this.splited,
 				showFocus: false,
@@ -73,7 +73,7 @@ export default defineComponent({
 		},
 
 		async chooseEmoji(ev) {
-			const vm = this.$root.new(await import('@/components/emoji-picker.vue'), {
+			const vm = os.popup(await import('@/components/emoji-picker.vue'), {
 				source: ev.currentTarget || ev.target
 			}).$once('chosen', emoji => {
 				this.reactions += emoji;

src/client/pages/preferences/plugins.vue

@@ -118,7 +118,7 @@ export default defineComponent({
 			}
 
 			const token = permissions == null || permissions.length === 0 ? null : await new Promise(async (res, rej) => {
-				this.$root.new(await import('@/components/token-generate-window.vue'), {
+				os.popup(await import('@/components/token-generate-window.vue'), {
 					title: this.$t('tokenRequested'),
 					information: this.$t('pluginTokenRequestedDescription'),
 					initialName: name,

src/client/pages/share.vue

@@ -60,7 +60,7 @@ export default defineComponent({
 			if (this.title) text += `【${this.title}】\n`;
 			if (this.text) text += `${this.text}\n`;
 			if (this.url) text += `${this.url}`;
-			this.$root.new(PostFormDialog, {
+			os.popup(PostFormDialog, {
 				instant: true,
 				initialText: text.trim()
 			}).$once('posted', () => {

src/client/pages/user/index.vue

@@ -189,7 +189,7 @@ export default defineComponent({
 		},
 
 		menu() {
-			this.$root.new(XUserMenu, {
+			os.popup(XUserMenu, {
 				source: this.$refs.menu,
 				user: this.user
 			});